Skip to content

Commit 149bfc4

Browse files
committed
Update GitHub workflow checkout/archive actions from v4 to v7
1 parent 4d28493 commit 149bfc4

5 files changed

Lines changed: 25 additions & 15 deletions

File tree

.github/workflows/build_android.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
runs-on: ['ubuntu-24.04']
2525

2626
steps:
27-
- uses: actions/checkout@v4
27+
- uses: actions/checkout@v7
2828
with:
2929
submodules: 'recursive'
3030

@@ -64,7 +64,7 @@ jobs:
6464
cmake --build "${{ github.workspace }}/cmake-build" --config "Release" --target install
6565
6666
- name: Upload Artifact
67-
uses: actions/upload-artifact@v4
67+
uses: actions/upload-artifact@v7
6868
with:
6969
name: projectm-android-${{ matrix.libs }}-${{ matrix.abi }}-api${{ matrix.platform-version }}
7070
path: install/*

.github/workflows/build_emscripten.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
runs-on: ubuntu-24.04
2626

2727
steps:
28-
- uses: actions/checkout@v4
28+
- uses: actions/checkout@v7
2929
with:
3030
submodules: 'recursive'
3131

@@ -78,7 +78,7 @@ jobs:
7878
# emcmake cmake --build "${{ github.workspace }}/cmake-build" --config "Release" --target install
7979

8080
- name: Upload Artifact
81-
uses: actions/upload-artifact@v4
81+
uses: actions/upload-artifact@v7
8282
with:
8383
name: projectm-emscripten-${{ matrix.libs }}-emsdk-${{ matrix.emsdk-version }}
8484
path: install/*

.github/workflows/build_linux.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
runs-on: ['ubuntu-24.04', 'ubuntu-22.04']
2424

2525
steps:
26-
- uses: actions/checkout@v4
26+
- uses: actions/checkout@v7
2727
with:
2828
submodules: 'recursive'
2929

@@ -92,7 +92,7 @@ jobs:
9292
cmake --build "${{ github.workspace }}/cmake-build-cxx-api" --config "Release"
9393
9494
- name: Upload Artifact
95-
uses: actions/upload-artifact@v4
95+
uses: actions/upload-artifact@v7
9696
with:
9797
name: projectm-linux-${{ matrix.libs }}-${{ matrix.fslib }}-${{ matrix.runs-on }}
9898
path: install/*

.github/workflows/build_osx.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
run: |
4242
brew install boost
4343
44-
- uses: actions/checkout@v4
44+
- uses: actions/checkout@v7
4545
with:
4646
submodules: 'recursive'
4747

@@ -94,7 +94,7 @@ jobs:
9494
cmake --build "${{ github.workspace }}/cmake-build-cxx-api" --config "Release"
9595
9696
- name: Upload Artifact
97-
uses: actions/upload-artifact@v4
97+
uses: actions/upload-artifact@v7
9898
with:
9999
name: projectm-osx-${{ matrix.libs }}-${{ matrix.fslib }}-${{ matrix.arch }}-${{ matrix.runs-on }}
100100
path: install/*
@@ -118,7 +118,7 @@ jobs:
118118
- name: Install Packages
119119
run: brew install ninja
120120

121-
- uses: actions/checkout@v4
121+
- uses: actions/checkout@v7
122122
with:
123123
submodules: 'recursive'
124124

@@ -164,7 +164,7 @@ jobs:
164164
"${{ github.workspace }}/install"
165165
166166
- name: Upload Framework Artifact
167-
uses: actions/upload-artifact@v4
167+
uses: actions/upload-artifact@v7
168168
with:
169169
name: projectm-osx-framework-${{ matrix.cxx_interface && 'cxx' || 'c-only' }}-${{ matrix.arch }}-${{ matrix.runs-on }}
170170
path: install/*

.github/workflows/build_windows.yml

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030

3131
steps:
3232
- name: Checkout vcpkg
33-
uses: actions/checkout@v4
33+
uses: actions/checkout@v7
3434
with:
3535
repository: microsoft/vcpkg
3636
path: vcpkg
@@ -57,7 +57,7 @@ jobs:
5757
-Source "${{ env.FEED_URL }}"
5858
5959
- name: Checkout libprojectM
60-
uses: actions/checkout@v4
60+
uses: actions/checkout@v7
6161
with:
6262
submodules: 'recursive'
6363

@@ -84,8 +84,13 @@ jobs:
8484
$runtime = ""
8585
$triplet = $triplet + "-static"
8686
}
87+
if("${{ matrix.runs-on }}" -eq "windows-2022") {
88+
$generator = "Visual Studio 17 2022"
89+
} else {
90+
$generator = "Visual Studio 18 2026"
91+
}
8792
88-
cmake -G "Visual Studio 17 2022" `
93+
cmake -G "$($generator)" `
8994
-A "${{ matrix.arch }}" `
9095
-S "${{ github.workspace }}" `
9196
-B "${{ github.workspace }}/cmake-build" `
@@ -132,8 +137,13 @@ jobs:
132137
$runtime = ""
133138
$triplet = $triplet + "-static"
134139
}
140+
if("${{ matrix.runs-on }}" -eq "windows-2022") {
141+
$generator = "Visual Studio 17 2022"
142+
} else {
143+
$generator = "Visual Studio 18 2026"
144+
}
135145
136-
cmake -G "Visual Studio 17 2022" `
146+
cmake -G "$($generator)" `
137147
-A "${{ matrix.arch }}" `
138148
-S "${{ github.workspace }}/tests/cxx-interface" `
139149
-B "${{ github.workspace }}/cmake-build-cxx-api" `
@@ -148,7 +158,7 @@ jobs:
148158
cmake --build "${{ github.workspace }}/cmake-build-cxx-api" --config "Release"
149159
150160
- name: Upload Artifact
151-
uses: actions/upload-artifact@v4
161+
uses: actions/upload-artifact@v7
152162
with:
153163
name: projectm-windows-${{ matrix.libs }}-${{ matrix.fslib }}-${{ matrix.arch }}-${{ matrix.runs-on }}
154164
path: install/*

0 commit comments

Comments
 (0)