node20 is deprecated, clear the warnings

bump action versions and change the MSVC action to a composite one that doesn't use node at all

also remove msbuild which we don't need
This commit is contained in:
Marco Antonio J. Costa
2026-07-21 14:45:04 -03:00
committed by majcosta
parent 8d1877d26d
commit 9adc1ad998
+13 -16
View File
@@ -139,7 +139,7 @@ jobs:
cat dist/versions.env cat dist/versions.env
- name: Upload - name: Upload
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v7
with: with:
name: versions.env name: versions.env
path: dist/ path: dist/
@@ -147,7 +147,7 @@ jobs:
# every executable contains all languages and picks one at runtime, so one build serves every package # every executable contains all languages and picks one at runtime, so one build serves every package
compile: compile:
needs: [ workflow_setup ] needs: [ workflow_setup ]
runs-on: windows-latest # required for msbuild runs-on: windows-latest # required for the MSVC toolchain
strategy: strategy:
fail-fast: false fail-fast: false
matrix: matrix:
@@ -155,10 +155,10 @@ jobs:
steps: steps:
- name: Checkout source - name: Checkout source
uses: actions/checkout@v4 uses: actions/checkout@v7
- name: Download versions.env - name: Download versions.env
uses: actions/download-artifact@v4 uses: actions/download-artifact@v8
with: with:
name: versions.env name: versions.env
path: artifacts path: artifacts
@@ -190,10 +190,7 @@ jobs:
JA2Application=$JA2Application JA2Application=$JA2Application
" >> $GITHUB_ENV " >> $GITHUB_ENV
- uses: microsoft/setup-msbuild@v2 - uses: egor-tensin/vs-shell@v2
with:
msbuild-architecture: x86
- uses: ilammy/msvc-dev-cmd@v1
with: with:
arch: x86 arch: x86
- name: Prepare build - name: Prepare build
@@ -208,7 +205,7 @@ jobs:
find build/ find build/
- name: Upload - name: Upload
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v7
with: with:
name: ${{ matrix.application }} name: ${{ matrix.application }}
path: build/*.exe path: build/*.exe
@@ -227,7 +224,7 @@ jobs:
steps: steps:
- name: Download versions.env - name: Download versions.env
uses: actions/download-artifact@v4 uses: actions/download-artifact@v8
with: with:
name: versions.env name: versions.env
path: artifacts path: artifacts
@@ -236,7 +233,7 @@ jobs:
run: cat artifacts/versions.env >> $GITHUB_ENV run: cat artifacts/versions.env >> $GITHUB_ENV
- name: Checkout gamedir - name: Checkout gamedir
uses: actions/checkout@v4 uses: actions/checkout@v7
with: with:
repository: ${{ env.GAMEDIR_REPOSITORY }} repository: ${{ env.GAMEDIR_REPOSITORY }}
ref: ${{ env.GAMEDIR_COMMIT_SHA }} ref: ${{ env.GAMEDIR_COMMIT_SHA }}
@@ -244,7 +241,7 @@ jobs:
- name: Checkout gamedir-languages - name: Checkout gamedir-languages
if: matrix.language != 'English' if: matrix.language != 'English'
uses: actions/checkout@v4 uses: actions/checkout@v7
with: with:
repository: ${{ env.GAMEDIR_LANGUAGES_REPOSITORY }} repository: ${{ env.GAMEDIR_LANGUAGES_REPOSITORY }}
ref: ${{ env.GAMEDIR_LANGUAGES_COMMIT_SHA }} ref: ${{ env.GAMEDIR_LANGUAGES_COMMIT_SHA }}
@@ -258,7 +255,7 @@ jobs:
cp -a gamedir-languages/${{ matrix.language }}_Version/* gamedir/ cp -a gamedir-languages/${{ matrix.language }}_Version/* gamedir/
- name: Download applications - name: Download applications
uses: actions/download-artifact@v4 uses: actions/download-artifact@v8
with: with:
pattern: ja2* pattern: ja2*
path: artifacts path: artifacts
@@ -308,7 +305,7 @@ jobs:
7z a -bb -xr'!.*' "../dist/${DIST_NAME}.7z" . 7z a -bb -xr'!.*' "../dist/${DIST_NAME}.7z" .
- name: Upload - name: Upload
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v7
with: with:
name: ${{ matrix.language }}_release name: ${{ matrix.language }}_release
path: dist/ path: dist/
@@ -321,14 +318,14 @@ jobs:
steps: steps:
- name: Download artifacts - name: Download artifacts
uses: actions/download-artifact@v4 uses: actions/download-artifact@v8
with: with:
path: dist path: dist
pattern: '*_release' pattern: '*_release'
merge-multiple: true merge-multiple: true
- name: Checkout Repo - name: Checkout Repo
uses: actions/checkout@v4 uses: actions/checkout@v7
with: with:
path: source path: source
fetch-depth: 1 fetch-depth: 1