Skip to content

Commit d98ae09

Browse files
authored
ci: Updates for latest windows-latest runner image. (#1319)
1. Switch back to windows-latest image. 2. Don't try to remove NSIS 3.x before installing NSIS 2.46, since NSIS 3.x is no longer installed by default.
1 parent 2388bbf commit d98ae09

File tree

1 file changed

+7
-8
lines changed

1 file changed

+7
-8
lines changed

.github/workflows/build.yml

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
build:
2323
strategy:
2424
matrix:
25-
os: [windows-2022, macos-latest]
25+
os: [windows-latest, macos-latest]
2626
runs-on: ${{ matrix.os }}
2727
steps:
2828
- name: set env
@@ -37,7 +37,7 @@ jobs:
3737
# For example: pr1234-101,23631c6e
3838
echo version=pr${{ github.event.number }}-$GITHUB_RUN_NUMBER,${GITHUB_SHA:0:8} >> "$GITHUB_ENV"
3939
fi
40-
if [ ${{ matrix.os }} == windows-2022 ]; then
40+
if [ ${{ matrix.os }} == windows-latest ]; then
4141
echo os=windows >> "$GITHUB_ENV"
4242
else
4343
echo os=mac >> "$GITHUB_ENV"
@@ -52,16 +52,15 @@ jobs:
5252
- name: setup
5353
run: pip install scons
5454
- name: SCons MSVC Cache
55-
if: ${{ matrix.os == 'windows-2022' }}
55+
if: ${{ matrix.os == 'windows-latest' }}
5656
uses: actions/cache@v4
5757
with:
5858
path: ~\scons_msvc_cache.json
5959
key: ${{ env.CACHE_KEY }}
6060
- name: Windows setup
61-
if: ${{ matrix.os == 'windows-2022' }}
61+
if: ${{ matrix.os == 'windows-latest' }}
6262
# Use NSIS 2.46 to reduce AV false positives.
6363
run: |
64-
choco uninstall nsis nsis.install -y
6564
choco install nsis-unicode -y
6665
- name: Mac setup
6766
if: ${{ matrix.os == 'macos-latest' }}
@@ -70,7 +69,7 @@ jobs:
7069
- name: build
7170
run: scons "publisher=${{ env.publisher }}" version=${{ env.version }}
7271
- name: sign Windows
73-
if: ${{ github.event_name == 'push' && matrix.os == 'windows-2022' }}
72+
if: ${{ github.event_name == 'push' && matrix.os == 'windows-latest' }}
7473
uses: azure/trusted-signing-action@v0
7574
with:
7675
azure-tenant-id: ${{ secrets.AZURE_TENANT_ID }}
@@ -245,7 +244,7 @@ jobs:
245244
echo "Mac app signed and notarized successfully!"
246245
# We only need to upload the pot on one OS. We arbitrarily pick Windows.
247246
- name: pot
248-
if: ${{ github.event_name == 'push' && matrix.os == 'windows-2022' }}
247+
if: ${{ github.event_name == 'push' && matrix.os == 'windows-latest' }}
249248
env:
250249
crowdinAuthToken: ${{ secrets.CROWDIN_AUTH_TOKEN }}
251250
run: |
@@ -270,7 +269,7 @@ jobs:
270269
echo ${{ env.os }}Url=${{ fromJSON(steps.uploadBuild.outputs.assets)[0].browser_download_url }} >> "$GITHUB_OUTPUT"
271270
# We upload pull request builds as normal artifacts.
272271
- name: upload PR build Win
273-
if: ${{ github.event_name == 'pull_request' && matrix.os == 'windows-2022' }}
272+
if: ${{ github.event_name == 'pull_request' && matrix.os == 'windows-latest' }}
274273
uses: actions/upload-artifact@v4
275274
with:
276275
name: osara_windows_${{ env.version }}

0 commit comments

Comments
 (0)