Skip to content

Commit 7c0c086

Browse files
deansheatherdeansheather
committed
fixes
1 parent eca31a8 commit 7c0c086

File tree

4 files changed

+35
-24
lines changed

4 files changed

+35
-24
lines changed

‎.github/workflows/ci.yaml

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -350,7 +350,7 @@ jobs:
350350
- name: Disable Spotlight Indexing
351351
if: runner.os == 'macOS'
352352
run: |
353-
enabled=$(sudo mdutil -a -s | grep -c "Indexing enabled")
353+
enabled=$(sudo mdutil -a -s | { grep -Fc "Indexing enabled" || true; })
354354
if [ "$enabled" -eq 0 ]; then
355355
echo "Spotlight indexing is already disabled"
356356
exit 0
@@ -449,13 +449,13 @@ jobs:
449449
# if macOS, install google-chrome for scaletests
450450
# As another concern, should we really have this kind of external dependency
451451
# requirement on standard CI?
452-
if [ "${RUNNER_OS}" == "macos-latest" ]; then
452+
if [ "${RUNNER_OS}" == "macOS" ]; then
453453
brew install google-chrome
454454
fi
455455
456456
# macOS will output "The default interactive shell is now zsh"
457457
# intermittently in CI...
458-
if [ "${RUNNER_OS}" == "macos-latest" ]; then
458+
if [ "${RUNNER_OS}" == "macOS" ]; then
459459
touch ~/.bash_profile && echo "export BASH_SILENCE_DEPRECATION_WARNING=1" >> ~/.bash_profile
460460
fi
461461
@@ -1166,9 +1166,9 @@ jobs:
11661166

11671167
- name: Insert dylibs
11681168
run: |
1169-
mv "./build/*amd64.dylib" ./site/out/bin/coder-vpn-darwin-amd64.dylib
1170-
mv "./build/*arm64.dylib" ./site/out/bin/coder-vpn-darwin-arm64.dylib
1171-
mv "./build/*arm64.h" ./site/out/bin/coder-vpn-darwin-dylib.h
1169+
mv ./build/*amd64.dylib ./site/out/bin/coder-vpn-darwin-amd64.dylib
1170+
mv ./build/*arm64.dylib ./site/out/bin/coder-vpn-darwin-arm64.dylib
1171+
mv ./build/*arm64.h ./site/out/bin/coder-vpn-darwin-dylib.h
11721172
11731173
- name: Build
11741174
run: |
@@ -1573,7 +1573,7 @@ jobs:
15731573

15741574
steps:
15751575
- name: Send Slack notification
1576-
run: | # zizmor: ignore[template-injection] We're reading variables from github context into a json string, so replacing with envs is tricky
1576+
run: |
15771577
curl -X POST -H 'Content-type: application/json' \
15781578
--data '{
15791579
"blocks": [
@@ -1590,23 +1590,23 @@ jobs:
15901590
"fields": [
15911591
{
15921592
"type": "mrkdwn",
1593-
"text": "*Workflow:*\n${{ github.workflow }}"
1593+
"text": "*Workflow:*\n'"${GITHUB_WORKFLOW}"'"
15941594
},
15951595
{
15961596
"type": "mrkdwn",
1597-
"text": "*Committer:*\n${{ github.actor }}"
1597+
"text": "*Committer:*\n'"${GITHUB_ACTOR}"'"
15981598
},
15991599
{
16001600
"type": "mrkdwn",
1601-
"text": "*Commit:*\n${{ github.sha }}"
1601+
"text": "*Commit:*\n'"${GITHUB_SHA}"'"
16021602
}
16031603
]
16041604
},
16051605
{
16061606
"type": "section",
16071607
"text": {
16081608
"type": "mrkdwn",
1609-
"text": "*View failure:* <${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}|Click here>"
1609+
"text": "*View failure:* <'"${RUN_URL}"'|Click here>"
16101610
}
16111611
},
16121612
{
@@ -1617,4 +1617,7 @@ jobs:
16171617
}
16181618
}
16191619
]
1620-
}' ${{ secrets.CI_FAILURE_SLACK_WEBHOOK }}
1620+
}' "${SLACK_WEBHOOK}"
1621+
env:
1622+
SLACK_WEBHOOK: ${{ secrets.CI_FAILURE_SLACK_WEBHOOK }}
1623+
RUN_URL: "${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}"

‎.github/workflows/dependabot.yaml

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
GH_TOKEN: ${{secrets.GITHUB_TOKEN}}
4545

4646
- name: Send Slack notification
47-
run: | # zizmor: ignore[template-injection] We're reading variables from github context into a json string, so replacing with envs is tricky
47+
run: |
4848
curl -X POST -H 'Content-type: application/json' \
4949
--data '{
5050
"username": "dependabot",
@@ -54,7 +54,7 @@ jobs:
5454
"type": "header",
5555
"text": {
5656
"type": "plain_text",
57-
"text": ":pr-merged: Auto merge enabled for Dependabot PR #${{ github.event.pull_request.number }}",
57+
"text": ":pr-merged: Auto merge enabled for Dependabot PR #'"${PR_NUMBER}"'",
5858
"emoji": true
5959
}
6060
},
@@ -63,7 +63,7 @@ jobs:
6363
"fields": [
6464
{
6565
"type": "mrkdwn",
66-
"text": "${{ github.event.pull_request.number }}"
66+
"text": "'"${PR_TITLE}"'"
6767
}
6868
]
6969
},
@@ -76,9 +76,14 @@ jobs:
7676
"type": "plain_text",
7777
"text": "View PR"
7878
},
79-
"url": "${{ github.event.pull_request.html_url }}"
79+
"url": "'"${PR_URL}"'"
8080
}
8181
]
8282
}
8383
]
8484
}' "${{ secrets.DEPENDABOT_PRS_SLACK_WEBHOOK }}"
85+
env:
86+
SLACK_WEBHOOK: ${{ secrets.DEPENDABOT_PRS_SLACK_WEBHOOK }}
87+
PR_NUMBER: ${{ github.event.pull_request.number }}
88+
PR_TITLE: ${{ github.event.pull_request.title }}
89+
PR_URL: ${{ github.event.pull_request.html_url }}

‎.github/workflows/nightly-gauntlet.yaml

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
- name: Disable Spotlight Indexing
3838
if: runner.os == 'macOS'
3939
run: |
40-
enabled=$(sudo mdutil -a -s | grep -c "Indexing enabled")
40+
enabled=$(sudo mdutil -a -s | { grep -Fc "Indexing enabled" || true; })
4141
if [ "$enabled" -eq 0 ]; then
4242
echo "Spotlight indexing is already disabled"
4343
exit 0
@@ -169,7 +169,7 @@ jobs:
169169

170170
steps:
171171
- name: Send Slack notification
172-
run: | # zizmor: ignore[template-injection] We're reading variables from github context into a json string, so replacing with envs is tricky
172+
run: |
173173
curl -X POST -H 'Content-type: application/json' \
174174
--data '{
175175
"blocks": [
@@ -186,23 +186,23 @@ jobs:
186186
"fields": [
187187
{
188188
"type": "mrkdwn",
189-
"text": "*Workflow:*\n${{ github.workflow }}"
189+
"text": "*Workflow:*\n'"${GITHUB_WORKFLOW}"'"
190190
},
191191
{
192192
"type": "mrkdwn",
193-
"text": "*Committer:*\n${{ github.actor }}"
193+
"text": "*Committer:*\n'"${GITHUB_ACTOR}"'"
194194
},
195195
{
196196
"type": "mrkdwn",
197-
"text": "*Commit:*\n${{ github.sha }}"
197+
"text": "*Commit:*\n'"${GITHUB_SHA}"'"
198198
}
199199
]
200200
},
201201
{
202202
"type": "section",
203203
"text": {
204204
"type": "mrkdwn",
205-
"text": "*View failure:* <${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}|Click here>"
205+
"text": "*View failure:* <'"${RUN_URL}"'|Click here>"
206206
}
207207
},
208208
{
@@ -213,4 +213,7 @@ jobs:
213213
}
214214
}
215215
]
216-
}' "${{ secrets.CI_FAILURE_SLACK_WEBHOOK }}"
216+
}' "${SLACK_WEBHOOK}"
217+
env:
218+
SLACK_WEBHOOK: ${{ secrets.CI_FAILURE_SLACK_WEBHOOK }}
219+
RUN_URL: "${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}"

‎.github/workflows/release.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -910,7 +910,7 @@ jobs:
910910
# The package version is the same as the tag minus the leading "v".
911911
# The version in this output already has the leading "v" removed but
912912
# we do it again to be safe.
913-
$version = "${NEEDS_RELEASE_OUTPUTS_VERSION}".Trim('v')
913+
$version = $env:VERSION.Trim('v')
914914
915915
$release_assets = gh release view --repo coder/coder "v${version}" --json assets | `
916916
ConvertFrom-Json

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy