Skip to content

Commit 899d8b8

Browse files
danoli3danoli3
authored
GitHub Actions Updates (#548)
* GitHub Actions Updates and MetalAngle Enabled. xros/catOS/watchOS enabled * Actions Update macOS-14 runner still * Metal Angle off for now their download depends is broken * macOS Fix modular * Metal Angle changes * macOS Actions * utf8 4.0.6 -> 4.0.9
1 parent d0d94d1 commit 899d8b8

20 files changed

+134
-82
lines changed

‎.github/workflows/build-android.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ jobs:
5151
NDK: ${{ matrix.NDK }}
5252
ANDROID_API: ${{ matrix.API }}
5353
steps:
54-
- uses: actions/checkout@v4.2.2
54+
- uses: actions/checkout@v6.0.2
5555
- name: Determine Release
5656
id: vars
5757
shell: bash
@@ -70,7 +70,7 @@ jobs:
7070
- name: Scripts Calc Formula Android - ${{ matrix.ARCH }}
7171
run: ./scripts/calculate_formulas.sh
7272
- name: Download previous artifacts
73-
uses: actions/github-script@v7
73+
uses: actions/github-script@v8.0.0
7474
if: env.USE_ARTIFACT == 'true'
7575
with:
7676
script: |
@@ -173,7 +173,7 @@ jobs:
173173

174174
- name: Upload Artifact
175175
if: github.repository == 'openframeworks/apothecary' && github.event_name == 'push' && (github.ref == 'refs/heads/master' || github.ref == 'refs/heads/bleeding') && env.USE_ARTIFACT == 'true'
176-
uses: actions/upload-artifact@v4
176+
uses: actions/upload-artifact@v7.0.0
177177
with:
178178
name: libs-${{ env.RELEASE }}-android-${{ env.ARCH }}
179179
path: out/${{ env.FILENAME }}
@@ -200,7 +200,7 @@ jobs:
200200
GA_CI_SECRET: ${{ secrets.CI_SECRET }}
201201
- name: Update Release emscripten
202202
if: github.repository == 'openframeworks/apothecary' && github.event_name == 'push' && (startsWith(github.ref, 'refs/tags/') || github.ref == 'refs/heads/master' || github.ref == 'refs/heads/bleeding')
203-
uses: softprops/action-gh-release@v2.1.0
203+
uses: softprops/action-gh-release@v2.6.1
204204
with:
205205
token: ${{ secrets.GITHUB_TOKEN }}
206206
tag_name: ${{ env.RELEASE }}

‎.github/workflows/build-catos.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ jobs:
5959
else
6060
echo "RELEASE=latest" >> $GITHUB_ENV
6161
fi
62-
- uses: actions/checkout@v4.2.2
62+
- uses: actions/checkout@v6.0.2
6363
- name: Scripts Calc Formula - ${{ env.TARGET }} Bundle ${{ matrix.bundle }}
6464
run: ./scripts/calculate_formulas.sh
6565
- name: Scripts Install
@@ -91,7 +91,7 @@ jobs:
9191
GA_CI_SECRET: ${{ secrets.CI_SECRET }}
9292
- name: Upload binaries as Artifact
9393
if: github.repository == 'openframeworks/apothecary' && github.event_name == 'push' && (github.ref == 'refs/heads/master' || github.ref == 'refs/heads/bleeding')
94-
uses: actions/upload-artifact@v4
94+
uses: actions/upload-artifact@v7.0.0
9595
with:
9696
name: libs-mac-cataylst-${{ env.TARGET }}-${{ matrix.bundle }}
9797
path: out/openFrameworksLibs_${{ env.release }}_${{ env.TARGET }}_${{ matrix.bundle }}.tar.bz2

‎.github/workflows/build-emscripten.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
matrix:
4545
ARCH: [32, 64]
4646
steps:
47-
- uses: actions/checkout@v4.2.2
47+
- uses: actions/checkout@v6.0.2
4848
- name: Install Emscripten SDK (emsdk)
4949
run: |
5050
git clone https://github.com/emscripten-core/emsdk.git $HOME/emsdk
@@ -88,7 +88,7 @@ jobs:
8888
echo "RELEASE=latest" >> $GITHUB_ENV
8989
fi
9090
- name: Download previous artifacts
91-
uses: actions/github-script@v7
91+
uses: actions/github-script@v8.0.0
9292
if: env.USE_ARTIFACT == 'true'
9393
with:
9494
script: |
@@ -186,7 +186,7 @@ jobs:
186186

187187
- name: Upload Artifact
188188
if: github.repository == 'openframeworks/apothecary' && github.event_name == 'push' && (github.ref == 'refs/heads/master' || github.ref == 'refs/heads/bleeding') && env.USE_ARTIFACT == 'true'
189-
uses: actions/upload-artifact@v4
189+
uses: actions/upload-artifact@v7.0.0
190190
with:
191191
name: libs-${{ env.RELEASE }}-emscripten-${{ env.ARCH }}
192192
path: out/${{ env.FILENAME }}
@@ -214,7 +214,7 @@ jobs:
214214

215215
- name: Update Release
216216
if: github.repository == 'openframeworks/apothecary' && github.event_name == 'push' && (startsWith(github.ref, 'refs/tags/') || github.ref == 'refs/heads/master' || github.ref == 'refs/heads/bleeding')
217-
uses: softprops/action-gh-release@v2.1.0
217+
uses: softprops/action-gh-release@v2.6.1
218218
with:
219219
token: ${{ secrets.GITHUB_TOKEN }}
220220
tag_name: ${{ env.RELEASE }}
@@ -236,7 +236,7 @@ jobs:
236236

237237
- name: Upload to GitHub Release
238238
if: github.repository == 'openframeworks/apothecary' && github.event_name == 'push' && (startsWith(github.ref, 'refs/tags/') || github.ref == 'refs/heads/master' || github.ref == 'refs/heads/bleeding')
239-
uses: softprops/action-gh-release@v2.1.0
239+
uses: softprops/action-gh-release@v2.6.1
240240
with:
241241
token: ${{ secrets.GITHUB_TOKEN }}
242242
tag_name: "latest-modular"

‎.github/workflows/build-ios.yml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -65,13 +65,13 @@ jobs:
6565
else
6666
echo "RELEASE=latest" >> $GITHUB_ENV
6767
fi
68-
- uses: actions/checkout@v4.2.2
68+
- uses: actions/checkout@v6.0.2
6969
- name: Scripts Calc Formula - ${{ env.TARGET }} Bundle ${{ matrix.bundle }}
7070
run: ./scripts/calculate_formulas.sh
7171
- name: Scripts Install
7272
run: ./scripts/osx/install.sh
7373
- name: 'Download artifacts'
74-
uses: actions/github-script@v7
74+
uses: actions/github-script@v8.0.0
7575
if: env.USE_ARTIFACT == 'true'
7676
with:
7777
script: |
@@ -202,7 +202,7 @@ jobs:
202202
BUNDLE: ${{ matrix.bundle }}
203203
- name: Upload binaries as Artifact
204204
if: github.repository == 'openframeworks/apothecary' && github.event_name == 'push' && (github.ref == 'refs/heads/master' || github.ref == 'refs/heads/bleeding')
205-
uses: actions/upload-artifact@v4
205+
uses: actions/upload-artifact@v7.0.0
206206
with:
207207
name: libs-${{ env.RELEASE }}-${{ env.TARGET }}-${{ matrix.bundle }}
208208
path: out/openFrameworksLibs_${{ env.RELEASE }}_${{ env.TARGET }}_${{ matrix.bundle }}.tar.bz2
@@ -227,7 +227,7 @@ jobs:
227227
BUNDLE: ${{ matrix.bundle }}
228228
- name: Update Release arm64
229229
if: github.repository == 'openframeworks/apothecary' && github.event_name == 'push' && (startsWith(github.ref, 'refs/tags/') || github.ref == 'refs/heads/master' || github.ref == 'refs/heads/bleeding')
230-
uses: softprops/action-gh-release@v2.1.0
230+
uses: softprops/action-gh-release@v2.6.1
231231
with:
232232
token: ${{ secrets.GITHUB_TOKEN }}
233233
tag_name: ${{ env.RELEASE }}
@@ -252,7 +252,7 @@ jobs:
252252
# uses: NathanFirmo/wait-for-other-action@v1.0.4
253253
# with:
254254
# token: ${{ secrets.GITHUB_TOKEN }}
255-
# workflow: 'build-xros.yml'
255+
# workflow: 'build-xros.yml'
256256
# - name: Wait build-catos
257257
# uses: NathanFirmo/wait-for-other-action@v1.0.4
258258
# with:
@@ -289,13 +289,13 @@ jobs:
289289
else
290290
echo "RELEASE=latest" >> $GITHUB_ENV
291291
fi
292-
- uses: actions/checkout@v4.2.2
292+
- uses: actions/checkout@v6.0.2
293293
- name: Scripts Calc Formula
294294
run: ./scripts/calculate_formulas.sh
295295
- name: Scripts Install
296296
run: ./scripts/macos/install.sh
297297
- name: 'Download all artifacts'
298-
uses: actions/github-script@v7
298+
uses: actions/github-script@v8.0.0
299299
with:
300300
script: |
301301
const fs = require('fs');
@@ -414,21 +414,21 @@ jobs:
414414
GA_CI_SECRET: ${{ secrets.CI_SECRET }}
415415
- name: Update Release macOS 1
416416
if: github.repository == 'openframeworks/apothecary' && github.event_name == 'push' && (startsWith(github.ref, 'refs/tags/') || github.ref == 'refs/heads/master' || github.ref == 'refs/heads/bleeding')
417-
uses: softprops/action-gh-release@v2.1.0
417+
uses: softprops/action-gh-release@v2.6.1
418418
with:
419419
token: ${{ secrets.GITHUB_TOKEN }}
420420
tag_name: ${{ env.RELEASE }}
421421
files: xout_1/openFrameworksLibs_${{ env.RELEASE }}_${{ env.TARGET }}_1.tar.bz2
422422
- name: Update Release macOS 2
423423
if: github.repository == 'openframeworks/apothecary' && github.event_name == 'push' && (startsWith(github.ref, 'refs/tags/') || github.ref == 'refs/heads/master' || github.ref == 'refs/heads/bleeding')
424-
uses: softprops/action-gh-release@v2.1.0
424+
uses: softprops/action-gh-release@v2.6.1
425425
with:
426426
token: ${{ secrets.GITHUB_TOKEN }}
427427
tag_name: ${{ env.RELEASE }}
428428
files: xout_2/openFrameworksLibs_${{ env.RELEASE }}_${{ env.TARGET }}_2.tar.bz2
429429
- name: Update Release macOS 3
430430
if: github.repository == 'openframeworks/apothecary' && github.event_name == 'push' && (startsWith(github.ref, 'refs/tags/') || github.ref == 'refs/heads/master' || github.ref == 'refs/heads/bleeding')
431-
uses: softprops/action-gh-release@v2.1.0
431+
uses: softprops/action-gh-release@v2.6.1
432432
with:
433433
token: ${{ secrets.GITHUB_TOKEN }}
434434
tag_name: ${{ env.RELEASE }}

‎.github/workflows/build-linux-cross.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ jobs:
5050
ARCH: ${{matrix.cfg.arch}}
5151
DISTRO: ${{matrix.cfg.distro}}
5252
steps:
53-
- uses: actions/checkout@v4.2.2
53+
- uses: actions/checkout@v6.0.2
5454
- name: Check if Workflow is disabled
5555
run: |
5656
if [ "${{ env.DISABLE_WORKFLOW }}" == "true" ]; then
@@ -89,7 +89,7 @@ jobs:
8989
run: ls -lah out/
9090
- name: Update GitHub Release
9191
if: github.repository == 'openframeworks/apothecary' && github.event_name == 'push' && (startsWith(github.ref, 'refs/tags/') || github.ref == 'refs/heads/master' || github.ref == 'refs/heads/bleeding')
92-
uses: softprops/action-gh-release@v2.1.0
92+
uses: softprops/action-gh-release@v2.6.1
9393
with:
9494
token: ${{ secrets.GITHUB_TOKEN }}
9595
tag_name: ${{ env.RELEASE }}

‎.github/workflows/build-linux-rpi.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ jobs:
6666
TOOLCHAIN_ROOT: "${WORKDIR}/${CROSS_COMPILER}"
6767

6868
steps:
69-
- uses: actions/checkout@v4.2.2
69+
- uses: actions/checkout@v6.0.2
7070

7171
- name: Setup Environment
7272
run: |
@@ -114,7 +114,7 @@ jobs:
114114

115115
- name: Update Release
116116
if: github.repository == 'openframeworks/apothecary' && github.event_name == 'push' && (startsWith(github.ref, 'refs/tags/') || github.ref == 'refs/heads/master' || github.ref == 'refs/heads/bleeding')
117-
uses: softprops/action-gh-release@v2.1.0
117+
uses: softprops/action-gh-release@v2.6.1
118118
env:
119119
GCC: "_${{ matrix.CROSS_CPU }}_${{ matrix.CROSS_OS }}"
120120
with:
@@ -138,7 +138,7 @@ jobs:
138138
# TOOLCHAIN_PREFIX: "arm-linux-gnueabihf"
139139

140140
# steps:
141-
# - uses: actions/checkout@v4.2.2
141+
# - uses: actions/checkout@v6.0.2
142142
# - name: Determine Release
143143
# id: vars
144144
# shell: bash
@@ -180,7 +180,7 @@ jobs:
180180

181181
# - name: Update Release armv6l
182182
# if: github.repository == 'openframeworks/apothecary' && github.event_name == 'push' && (startsWith(github.ref, 'refs/tags/') || github.ref == 'refs/heads/master' || github.ref == 'refs/heads/bleeding')
183-
# uses: softprops/action-gh-release@v2.1.0
183+
# uses: softprops/action-gh-release@v2.6.1
184184
# with:
185185
# token: ${{ secrets.GITHUB_TOKEN }}
186186
# tag_name: ${{ env.RELEASE }}
@@ -201,7 +201,7 @@ jobs:
201201
# TOOLCHAIN_ROOT: "${WORKDIR}/${CROSS_COMPILER}"
202202
# TOOLCHAIN_PREFIX: "arm-linux-gnueabihf"
203203
# steps:
204-
# - uses: actions/checkout@v4.2.2
204+
# - uses: actions/checkout@v6.0.2
205205
# - name: Check if Workflow is disabled
206206
# run: |
207207
# if [ "${{ env.DISABLE_WORKFLOW }}" == "true" ]; then
@@ -267,7 +267,7 @@ jobs:
267267

268268
# - name: Update Release
269269
# if: github.repository == 'openframeworks/apothecary' && github.event_name == 'push' && (startsWith(github.ref, 'refs/tags/') || github.ref == 'refs/heads/master' || github.ref == 'refs/heads/bleeding')
270-
# uses: softprops/action-gh-release@v2.1.0
270+
# uses: softprops/action-gh-release@v2.6.1
271271
# with:
272272
# token: ${{ secrets.GITHUB_TOKEN }}
273273
# tag_name: ${{ env.RELEASE }}

‎.github/workflows/build-linux64.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ jobs:
5353
GCC: ${{matrix.cfg.gcc}}
5454
ARCH: ${{matrix.cfg.arch}}
5555
steps:
56-
- uses: actions/checkout@v4.2.2
56+
- uses: actions/checkout@v6.0.2
5757
- name: Check if Workflow is disabled
5858
run: |
5959
if [ "${{ env.DISABLE_WORKFLOW }}" == "true" ]; then
@@ -112,7 +112,7 @@ jobs:
112112
113113
- name: Update Release 64
114114
if: github.repository == 'openframeworks/apothecary' && github.event_name == 'push' && (startsWith(github.ref, 'refs/tags/') || github.ref == 'refs/heads/master' || github.ref == 'refs/heads/bleeding')
115-
uses: softprops/action-gh-release@v2.1.0
115+
uses: softprops/action-gh-release@v2.6.1
116116
with:
117117
token: ${{ secrets.GITHUB_TOKEN }}
118118
tag_name: ${{ env.RELEASE }}
@@ -146,7 +146,7 @@ jobs:
146146
- name: Upload to GitHub Release
147147
if: github.repository == 'openframeworks/apothecary' && github.event_name == 'push' && (startsWith(github.ref, 'refs/tags/') || github.ref == 'refs/heads/master' || github.ref == 'refs/heads/bleeding') &&
148148
env.GCC == 'gcc14'
149-
uses: softprops/action-gh-release@v2.1.0
149+
uses: softprops/action-gh-release@v2.6.1
150150
with:
151151
token: ${{ secrets.GITHUB_TOKEN }}
152152
tag_name: "latest-modular"

‎.github/workflows/build-macos.yml‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -59,13 +59,13 @@ jobs:
5959
else
6060
echo "RELEASE=latest" >> $GITHUB_ENV
6161
fi
62-
- uses: actions/checkout@v4.2.2
62+
- uses: actions/checkout@v6.0.2
6363
- name: Scripts Calc Formula - ${{ env.TARGET }} Bundle ${{ matrix.bundle }}
6464
run: ./scripts/calculate_formulas.sh
6565
- name: Scripts Install
6666
run: ./scripts/osx/install.sh
6767
- name: 'Download artifacts'
68-
uses: actions/github-script@v7
68+
uses: actions/github-script@v8.0.0
6969
if: env.USE_ARTIFACT == 'true'
7070
with:
7171
script: |
@@ -172,7 +172,7 @@ jobs:
172172
GA_CI_SECRET: ${{ secrets.CI_SECRET }}
173173
- name: Upload binaries as Artifact
174174
if: github.repository == 'openframeworks/apothecary' && github.event_name == 'push' && (github.ref == 'refs/heads/master' || github.ref == 'refs/heads/bleeding')
175-
uses: actions/upload-artifact@v4
175+
uses: actions/upload-artifact@v7.0.0
176176
with:
177177
name: libs-${{ env.RELEASE }}-${{ env.TARGET }}-${{ matrix.bundle }}
178178
path: out/openFrameworksLibs_${{ env.RELEASE }}_${{ env.TARGET }}_${{ matrix.bundle }}.tar.bz2
@@ -186,6 +186,12 @@ jobs:
186186
rm -f xout/*.tar.bz2
187187
echo "Cleanup complete."
188188
189+
- name: Merge our libraries into XC Framework
190+
working-directory: ${{ env.GITHUB_WORKSPACE }}
191+
run: scripts/osx/xcframework_all.sh
192+
env:
193+
BUNDLE: ${{ matrix.bundle }}
194+
189195
- name: Package Individual Modular Libraries (macOS)
190196
if: github.repository == 'openframeworks/apothecary' && github.event_name == 'push' && (github.ref == 'refs/heads/master' || github.ref == 'refs/heads/bleeding' || contains(github.ref, 'refs/tags/')) && matrix.bundle == 3
191197
working-directory: ${{ env.GITHUB_WORKSPACE }}
@@ -209,7 +215,7 @@ jobs:
209215
210216
- name: Upload to GitHub Release (latest-modular)
211217
if: github.repository == 'openframeworks/apothecary' && github.event_name == 'push' && (startsWith(github.ref, 'refs/tags/') || github.ref == 'refs/heads/master' || github.ref == 'refs/heads/bleeding') && matrix.bundle == 3
212-
uses: softprops/action-gh-release@v2.1.0
218+
uses: softprops/action-gh-release@v2.6.1
213219
with:
214220
token: ${{ secrets.GITHUB_TOKEN }}
215221
tag_name: "latest-modular"
@@ -223,11 +229,6 @@ jobs:
223229
rm -f xout/*.tar.bz2
224230
echo "Cleanup complete."
225231
226-
- name: Merge our libraries into XC Framework
227-
working-directory: ${{ env.GITHUB_WORKSPACE }}
228-
run: scripts/osx/xcframework_all.sh
229-
env:
230-
BUNDLE: ${{ matrix.bundle }}
231232
- name: Package final
232233
if: github.repository == 'openframeworks/apothecary' && github.event_name == 'push' && (github.ref == 'refs/heads/master' || github.ref == 'refs/heads/bleeding' || contains(github.ref, 'refs/tags/'))
233234
working-directory: ${{ env.GITHUB_WORKSPACE }}
@@ -236,7 +237,7 @@ jobs:
236237
BUNDLE: ${{ matrix.bundle }}
237238
- name: Update Release XCFramework
238239
if: github.repository == 'openframeworks/apothecary' && github.event_name == 'push' && (startsWith(github.ref, 'refs/tags/') || github.ref == 'refs/heads/master' || github.ref == 'refs/heads/bleeding')
239-
uses: softprops/action-gh-release@v2.1.0
240+
uses: softprops/action-gh-release@v2.6.1
240241
with:
241242
token: ${{ secrets.GITHUB_TOKEN }}
242243
tag_name: ${{ env.RELEASE }}

‎.github/workflows/build-msys2.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ jobs:
5252
shell: msys2 {0}
5353
steps:
5454
- name: Setup msys2
55-
uses: msys2/setup-msys2@v2.27.0
55+
uses: msys2/setup-msys2@v2.31.0
5656
with:
5757
update: true
5858
release : false
@@ -103,7 +103,7 @@ jobs:
103103
104104
- run: git config --global core.autocrlf input
105105
- name: Clone repository
106-
uses: actions/checkout@v4.2.2
106+
uses: actions/checkout@v6.0.2
107107

108108
- name: Build
109109
working-directory: ${{env.GITHUB_WORKSPACE}}
@@ -118,7 +118,7 @@ jobs:
118118
run: ls -lah out/
119119
- name: Update Release
120120
if: github.repository == 'openframeworks/apothecary' && github.event_name == 'push' && (startsWith(github.ref, 'refs/tags/') || github.ref == 'refs/heads/master' || github.ref == 'refs/heads/bleeding')
121-
uses: softprops/action-gh-release@v2.1.0
121+
uses: softprops/action-gh-release@v2.6.1
122122
with:
123123
token: ${{ secrets.GITHUB_TOKEN }}
124124
tag_name: ${{ env.RELEASE }}

0 commit comments

Comments
 (0)