diff --git a/.github/workflows/build_android.yml b/.github/workflows/build_android.yml index cf828730e..0675ac60e 100644 --- a/.github/workflows/build_android.yml +++ b/.github/workflows/build_android.yml @@ -24,7 +24,7 @@ jobs: runs-on: ['ubuntu-24.04'] steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v7 with: submodules: 'recursive' @@ -64,7 +64,7 @@ jobs: cmake --build "${{ github.workspace }}/cmake-build" --config "Release" --target install - name: Upload Artifact - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v7 with: name: projectm-android-${{ matrix.libs }}-${{ matrix.abi }}-api${{ matrix.platform-version }} path: install/* diff --git a/.github/workflows/build_emscripten.yml b/.github/workflows/build_emscripten.yml index 41d76356d..15bda9c38 100644 --- a/.github/workflows/build_emscripten.yml +++ b/.github/workflows/build_emscripten.yml @@ -25,7 +25,7 @@ jobs: runs-on: ubuntu-24.04 steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v7 with: submodules: 'recursive' @@ -78,7 +78,7 @@ jobs: # emcmake cmake --build "${{ github.workspace }}/cmake-build" --config "Release" --target install - name: Upload Artifact - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v7 with: name: projectm-emscripten-${{ matrix.libs }}-emsdk-${{ matrix.emsdk-version }} path: install/* \ No newline at end of file diff --git a/.github/workflows/build_linux.yml b/.github/workflows/build_linux.yml index d1395625b..a210c9c3e 100644 --- a/.github/workflows/build_linux.yml +++ b/.github/workflows/build_linux.yml @@ -23,7 +23,7 @@ jobs: runs-on: ['ubuntu-24.04', 'ubuntu-22.04'] steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v7 with: submodules: 'recursive' @@ -92,7 +92,7 @@ jobs: cmake --build "${{ github.workspace }}/cmake-build-cxx-api" --config "Release" - name: Upload Artifact - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v7 with: name: projectm-linux-${{ matrix.libs }}-${{ matrix.fslib }}-${{ matrix.runs-on }} path: install/* diff --git a/.github/workflows/build_osx.yml b/.github/workflows/build_osx.yml index 3be3d4305..6befbb16e 100644 --- a/.github/workflows/build_osx.yml +++ b/.github/workflows/build_osx.yml @@ -41,7 +41,7 @@ jobs: run: | brew install boost - - uses: actions/checkout@v4 + - uses: actions/checkout@v7 with: submodules: 'recursive' @@ -94,7 +94,7 @@ jobs: cmake --build "${{ github.workspace }}/cmake-build-cxx-api" --config "Release" - name: Upload Artifact - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v7 with: name: projectm-osx-${{ matrix.libs }}-${{ matrix.fslib }}-${{ matrix.arch }}-${{ matrix.runs-on }} path: install/* @@ -118,7 +118,7 @@ jobs: - name: Install Packages run: brew install ninja - - uses: actions/checkout@v4 + - uses: actions/checkout@v7 with: submodules: 'recursive' @@ -164,7 +164,7 @@ jobs: "${{ github.workspace }}/install" - name: Upload Framework Artifact - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v7 with: name: projectm-osx-framework-${{ matrix.cxx_interface && 'cxx' || 'c-only' }}-${{ matrix.arch }}-${{ matrix.runs-on }} path: install/* diff --git a/.github/workflows/build_windows.yml b/.github/workflows/build_windows.yml index 1876c7b51..00acf4e0c 100644 --- a/.github/workflows/build_windows.yml +++ b/.github/workflows/build_windows.yml @@ -30,7 +30,7 @@ jobs: steps: - name: Checkout vcpkg - uses: actions/checkout@v4 + uses: actions/checkout@v7 with: repository: microsoft/vcpkg path: vcpkg @@ -57,7 +57,7 @@ jobs: -Source "${{ env.FEED_URL }}" - name: Checkout libprojectM - uses: actions/checkout@v4 + uses: actions/checkout@v7 with: submodules: 'recursive' @@ -84,8 +84,13 @@ jobs: $runtime = "" $triplet = $triplet + "-static" } + if("${{ matrix.runs-on }}" -eq "windows-2022") { + $generator = "Visual Studio 17 2022" + } else { + $generator = "Visual Studio 18 2026" + } - cmake -G "Visual Studio 17 2022" ` + cmake -G "$($generator)" ` -A "${{ matrix.arch }}" ` -S "${{ github.workspace }}" ` -B "${{ github.workspace }}/cmake-build" ` @@ -132,8 +137,13 @@ jobs: $runtime = "" $triplet = $triplet + "-static" } + if("${{ matrix.runs-on }}" -eq "windows-2022") { + $generator = "Visual Studio 17 2022" + } else { + $generator = "Visual Studio 18 2026" + } - cmake -G "Visual Studio 17 2022" ` + cmake -G "$($generator)" ` -A "${{ matrix.arch }}" ` -S "${{ github.workspace }}/tests/cxx-interface" ` -B "${{ github.workspace }}/cmake-build-cxx-api" ` @@ -148,7 +158,7 @@ jobs: cmake --build "${{ github.workspace }}/cmake-build-cxx-api" --config "Release" - name: Upload Artifact - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v7 with: name: projectm-windows-${{ matrix.libs }}-${{ matrix.fslib }}-${{ matrix.arch }}-${{ matrix.runs-on }} path: install/*