Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/build-android.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ jobs:
NDK: ${{ matrix.NDK }}
ANDROID_API: ${{ matrix.API }}
steps:
- uses: actions/checkout@v4.2.2
- uses: actions/checkout@v6.0.2
- name: Determine Release
id: vars
shell: bash
Expand All @@ -70,7 +70,7 @@ jobs:
- name: Scripts Calc Formula Android - ${{ matrix.ARCH }}
run: ./scripts/calculate_formulas.sh
- name: Download previous artifacts
uses: actions/github-script@v7
uses: actions/github-script@v8.0.0
if: env.USE_ARTIFACT == 'true'
with:
script: |
Expand Down Expand Up @@ -173,7 +173,7 @@ jobs:

- name: Upload Artifact
if: github.repository == 'openframeworks/apothecary' && github.event_name == 'push' && (github.ref == 'refs/heads/master' || github.ref == 'refs/heads/bleeding') && env.USE_ARTIFACT == 'true'
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v7.0.0
with:
name: libs-${{ env.RELEASE }}-android-${{ env.ARCH }}
path: out/${{ env.FILENAME }}
Expand All @@ -200,7 +200,7 @@ jobs:
GA_CI_SECRET: ${{ secrets.CI_SECRET }}
- name: Update Release emscripten
if: github.repository == 'openframeworks/apothecary' && github.event_name == 'push' && (startsWith(github.ref, 'refs/tags/') || github.ref == 'refs/heads/master' || github.ref == 'refs/heads/bleeding')
uses: softprops/action-gh-release@v2.1.0
uses: softprops/action-gh-release@v2.6.1
with:
token: ${{ secrets.GITHUB_TOKEN }}
tag_name: ${{ env.RELEASE }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build-catos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ jobs:
else
echo "RELEASE=latest" >> $GITHUB_ENV
fi
- uses: actions/checkout@v4.2.2
- uses: actions/checkout@v6.0.2
- name: Scripts Calc Formula - ${{ env.TARGET }} Bundle ${{ matrix.bundle }}
run: ./scripts/calculate_formulas.sh
- name: Scripts Install
Expand Down Expand Up @@ -91,7 +91,7 @@ jobs:
GA_CI_SECRET: ${{ secrets.CI_SECRET }}
- name: Upload binaries as Artifact
if: github.repository == 'openframeworks/apothecary' && github.event_name == 'push' && (github.ref == 'refs/heads/master' || github.ref == 'refs/heads/bleeding')
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v7.0.0
with:
name: libs-mac-cataylst-${{ env.TARGET }}-${{ matrix.bundle }}
path: out/openFrameworksLibs_${{ env.release }}_${{ env.TARGET }}_${{ matrix.bundle }}.tar.bz2
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/build-emscripten.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ jobs:
matrix:
ARCH: [32, 64]
steps:
- uses: actions/checkout@v4.2.2
- uses: actions/checkout@v6.0.2
- name: Install Emscripten SDK (emsdk)
run: |
git clone https://github.com/emscripten-core/emsdk.git $HOME/emsdk
Expand Down Expand Up @@ -88,7 +88,7 @@ jobs:
echo "RELEASE=latest" >> $GITHUB_ENV
fi
- name: Download previous artifacts
uses: actions/github-script@v7
uses: actions/github-script@v8.0.0
if: env.USE_ARTIFACT == 'true'
with:
script: |
Expand Down Expand Up @@ -186,7 +186,7 @@ jobs:

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

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

- name: Upload to GitHub Release
if: github.repository == 'openframeworks/apothecary' && github.event_name == 'push' && (startsWith(github.ref, 'refs/tags/') || github.ref == 'refs/heads/master' || github.ref == 'refs/heads/bleeding')
uses: softprops/action-gh-release@v2.1.0
uses: softprops/action-gh-release@v2.6.1
with:
token: ${{ secrets.GITHUB_TOKEN }}
tag_name: "latest-modular"
Expand Down
20 changes: 10 additions & 10 deletions .github/workflows/build-ios.yml
Original file line number Diff line number Diff line change
Expand Up @@ -65,13 +65,13 @@ jobs:
else
echo "RELEASE=latest" >> $GITHUB_ENV
fi
- uses: actions/checkout@v4.2.2
- uses: actions/checkout@v6.0.2
- name: Scripts Calc Formula - ${{ env.TARGET }} Bundle ${{ matrix.bundle }}
run: ./scripts/calculate_formulas.sh
- name: Scripts Install
run: ./scripts/osx/install.sh
- name: 'Download artifacts'
uses: actions/github-script@v7
uses: actions/github-script@v8.0.0
if: env.USE_ARTIFACT == 'true'
with:
script: |
Expand Down Expand Up @@ -202,7 +202,7 @@ jobs:
BUNDLE: ${{ matrix.bundle }}
- name: Upload binaries as Artifact
if: github.repository == 'openframeworks/apothecary' && github.event_name == 'push' && (github.ref == 'refs/heads/master' || github.ref == 'refs/heads/bleeding')
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v7.0.0
with:
name: libs-${{ env.RELEASE }}-${{ env.TARGET }}-${{ matrix.bundle }}
path: out/openFrameworksLibs_${{ env.RELEASE }}_${{ env.TARGET }}_${{ matrix.bundle }}.tar.bz2
Expand All @@ -227,7 +227,7 @@ jobs:
BUNDLE: ${{ matrix.bundle }}
- name: Update Release arm64
if: github.repository == 'openframeworks/apothecary' && github.event_name == 'push' && (startsWith(github.ref, 'refs/tags/') || github.ref == 'refs/heads/master' || github.ref == 'refs/heads/bleeding')
uses: softprops/action-gh-release@v2.1.0
uses: softprops/action-gh-release@v2.6.1
with:
token: ${{ secrets.GITHUB_TOKEN }}
tag_name: ${{ env.RELEASE }}
Expand All @@ -252,7 +252,7 @@ jobs:
# uses: NathanFirmo/wait-for-other-action@v1.0.4
# with:
# token: ${{ secrets.GITHUB_TOKEN }}
# workflow: 'build-xros.yml'
# workflow: 'build-xros.yml'
# - name: Wait build-catos
# uses: NathanFirmo/wait-for-other-action@v1.0.4
# with:
Expand Down Expand Up @@ -289,13 +289,13 @@ jobs:
else
echo "RELEASE=latest" >> $GITHUB_ENV
fi
- uses: actions/checkout@v4.2.2
- uses: actions/checkout@v6.0.2
- name: Scripts Calc Formula
run: ./scripts/calculate_formulas.sh
- name: Scripts Install
run: ./scripts/macos/install.sh
- name: 'Download all artifacts'
uses: actions/github-script@v7
uses: actions/github-script@v8.0.0
with:
script: |
const fs = require('fs');
Expand Down Expand Up @@ -414,21 +414,21 @@ jobs:
GA_CI_SECRET: ${{ secrets.CI_SECRET }}
- name: Update Release macOS 1
if: github.repository == 'openframeworks/apothecary' && github.event_name == 'push' && (startsWith(github.ref, 'refs/tags/') || github.ref == 'refs/heads/master' || github.ref == 'refs/heads/bleeding')
uses: softprops/action-gh-release@v2.1.0
uses: softprops/action-gh-release@v2.6.1
with:
token: ${{ secrets.GITHUB_TOKEN }}
tag_name: ${{ env.RELEASE }}
files: xout_1/openFrameworksLibs_${{ env.RELEASE }}_${{ env.TARGET }}_1.tar.bz2
- name: Update Release macOS 2
if: github.repository == 'openframeworks/apothecary' && github.event_name == 'push' && (startsWith(github.ref, 'refs/tags/') || github.ref == 'refs/heads/master' || github.ref == 'refs/heads/bleeding')
uses: softprops/action-gh-release@v2.1.0
uses: softprops/action-gh-release@v2.6.1
with:
token: ${{ secrets.GITHUB_TOKEN }}
tag_name: ${{ env.RELEASE }}
files: xout_2/openFrameworksLibs_${{ env.RELEASE }}_${{ env.TARGET }}_2.tar.bz2
- name: Update Release macOS 3
if: github.repository == 'openframeworks/apothecary' && github.event_name == 'push' && (startsWith(github.ref, 'refs/tags/') || github.ref == 'refs/heads/master' || github.ref == 'refs/heads/bleeding')
uses: softprops/action-gh-release@v2.1.0
uses: softprops/action-gh-release@v2.6.1
with:
token: ${{ secrets.GITHUB_TOKEN }}
tag_name: ${{ env.RELEASE }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build-linux-cross.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ jobs:
ARCH: ${{matrix.cfg.arch}}
DISTRO: ${{matrix.cfg.distro}}
steps:
- uses: actions/checkout@v4.2.2
- uses: actions/checkout@v6.0.2
- name: Check if Workflow is disabled
run: |
if [ "${{ env.DISABLE_WORKFLOW }}" == "true" ]; then
Expand Down Expand Up @@ -89,7 +89,7 @@ jobs:
run: ls -lah out/
- name: Update GitHub Release
if: github.repository == 'openframeworks/apothecary' && github.event_name == 'push' && (startsWith(github.ref, 'refs/tags/') || github.ref == 'refs/heads/master' || github.ref == 'refs/heads/bleeding')
uses: softprops/action-gh-release@v2.1.0
uses: softprops/action-gh-release@v2.6.1
with:
token: ${{ secrets.GITHUB_TOKEN }}
tag_name: ${{ env.RELEASE }}
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/build-linux-rpi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ jobs:
TOOLCHAIN_ROOT: "${WORKDIR}/${CROSS_COMPILER}"

steps:
- uses: actions/checkout@v4.2.2
- uses: actions/checkout@v6.0.2

- name: Setup Environment
run: |
Expand Down Expand Up @@ -114,7 +114,7 @@ jobs:

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

# steps:
# - uses: actions/checkout@v4.2.2
# - uses: actions/checkout@v6.0.2
# - name: Determine Release
# id: vars
# shell: bash
Expand Down Expand Up @@ -180,7 +180,7 @@ jobs:

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

# - name: Update Release
# if: github.repository == 'openframeworks/apothecary' && github.event_name == 'push' && (startsWith(github.ref, 'refs/tags/') || github.ref == 'refs/heads/master' || github.ref == 'refs/heads/bleeding')
# uses: softprops/action-gh-release@v2.1.0
# uses: softprops/action-gh-release@v2.6.1
# with:
# token: ${{ secrets.GITHUB_TOKEN }}
# tag_name: ${{ env.RELEASE }}
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/build-linux64.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ jobs:
GCC: ${{matrix.cfg.gcc}}
ARCH: ${{matrix.cfg.arch}}
steps:
- uses: actions/checkout@v4.2.2
- uses: actions/checkout@v6.0.2
- name: Check if Workflow is disabled
run: |
if [ "${{ env.DISABLE_WORKFLOW }}" == "true" ]; then
Expand Down Expand Up @@ -112,7 +112,7 @@ jobs:

- name: Update Release 64
if: github.repository == 'openframeworks/apothecary' && github.event_name == 'push' && (startsWith(github.ref, 'refs/tags/') || github.ref == 'refs/heads/master' || github.ref == 'refs/heads/bleeding')
uses: softprops/action-gh-release@v2.1.0
uses: softprops/action-gh-release@v2.6.1
with:
token: ${{ secrets.GITHUB_TOKEN }}
tag_name: ${{ env.RELEASE }}
Expand Down Expand Up @@ -146,7 +146,7 @@ jobs:
- name: Upload to GitHub Release
if: github.repository == 'openframeworks/apothecary' && github.event_name == 'push' && (startsWith(github.ref, 'refs/tags/') || github.ref == 'refs/heads/master' || github.ref == 'refs/heads/bleeding') &&
env.GCC == 'gcc14'
uses: softprops/action-gh-release@v2.1.0
uses: softprops/action-gh-release@v2.6.1
with:
token: ${{ secrets.GITHUB_TOKEN }}
tag_name: "latest-modular"
Expand Down
21 changes: 11 additions & 10 deletions .github/workflows/build-macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,13 +59,13 @@ jobs:
else
echo "RELEASE=latest" >> $GITHUB_ENV
fi
- uses: actions/checkout@v4.2.2
- uses: actions/checkout@v6.0.2
- name: Scripts Calc Formula - ${{ env.TARGET }} Bundle ${{ matrix.bundle }}
run: ./scripts/calculate_formulas.sh
- name: Scripts Install
run: ./scripts/osx/install.sh
- name: 'Download artifacts'
uses: actions/github-script@v7
uses: actions/github-script@v8.0.0
if: env.USE_ARTIFACT == 'true'
with:
script: |
Expand Down Expand Up @@ -172,7 +172,7 @@ jobs:
GA_CI_SECRET: ${{ secrets.CI_SECRET }}
- name: Upload binaries as Artifact
if: github.repository == 'openframeworks/apothecary' && github.event_name == 'push' && (github.ref == 'refs/heads/master' || github.ref == 'refs/heads/bleeding')
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v7.0.0
with:
name: libs-${{ env.RELEASE }}-${{ env.TARGET }}-${{ matrix.bundle }}
path: out/openFrameworksLibs_${{ env.RELEASE }}_${{ env.TARGET }}_${{ matrix.bundle }}.tar.bz2
Expand All @@ -186,6 +186,12 @@ jobs:
rm -f xout/*.tar.bz2
echo "Cleanup complete."

- name: Merge our libraries into XC Framework
working-directory: ${{ env.GITHUB_WORKSPACE }}
run: scripts/osx/xcframework_all.sh
env:
BUNDLE: ${{ matrix.bundle }}

- name: Package Individual Modular Libraries (macOS)
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
working-directory: ${{ env.GITHUB_WORKSPACE }}
Expand All @@ -209,7 +215,7 @@ jobs:

- name: Upload to GitHub Release (latest-modular)
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
uses: softprops/action-gh-release@v2.1.0
uses: softprops/action-gh-release@v2.6.1
with:
token: ${{ secrets.GITHUB_TOKEN }}
tag_name: "latest-modular"
Expand All @@ -223,11 +229,6 @@ jobs:
rm -f xout/*.tar.bz2
echo "Cleanup complete."

- name: Merge our libraries into XC Framework
working-directory: ${{ env.GITHUB_WORKSPACE }}
run: scripts/osx/xcframework_all.sh
env:
BUNDLE: ${{ matrix.bundle }}
- name: Package final
if: github.repository == 'openframeworks/apothecary' && github.event_name == 'push' && (github.ref == 'refs/heads/master' || github.ref == 'refs/heads/bleeding' || contains(github.ref, 'refs/tags/'))
working-directory: ${{ env.GITHUB_WORKSPACE }}
Expand All @@ -236,7 +237,7 @@ jobs:
BUNDLE: ${{ matrix.bundle }}
- name: Update Release XCFramework
if: github.repository == 'openframeworks/apothecary' && github.event_name == 'push' && (startsWith(github.ref, 'refs/tags/') || github.ref == 'refs/heads/master' || github.ref == 'refs/heads/bleeding')
uses: softprops/action-gh-release@v2.1.0
uses: softprops/action-gh-release@v2.6.1
with:
token: ${{ secrets.GITHUB_TOKEN }}
tag_name: ${{ env.RELEASE }}
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/build-msys2.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ jobs:
shell: msys2 {0}
steps:
- name: Setup msys2
uses: msys2/setup-msys2@v2.27.0
uses: msys2/setup-msys2@v2.31.0
with:
update: true
release : false
Expand Down Expand Up @@ -103,7 +103,7 @@ jobs:

- run: git config --global core.autocrlf input
- name: Clone repository
uses: actions/checkout@v4.2.2
uses: actions/checkout@v6.0.2

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