From ca8441211f463fea4317a5789d39e6cc30b26cd9 Mon Sep 17 00:00:00 2001 From: Sudara Date: Sun, 9 Jun 2024 21:21:10 +0200 Subject: [PATCH] Be more explicit about JUCE7 and JUCE8 tests --- .github/workflows/tests.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 5088718..0d4501b 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -34,7 +34,7 @@ jobs: fail-fast: false # show errors for each platform vs. cancel build matrix: os: [ macos-11, macos-12, macos-13, macos-14, windows-2022, windows-2019, ubuntu-latest ] - juce: [ 7, 8 ] + juce: [ JUCE7, JUCE8 ] steps: @@ -76,7 +76,7 @@ jobs: # D_DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR is a temporary workaround for a Visual Studio+GA snafu # check if resolved here: https://github.com/sudara/pamplejuce/issues/103 run: | - if [ ${{ matrix.juce }} -eq 8 ]; then + if [ ${{ matrix.juce }} -eq JUCE8 ]; then cmake -B ${{ env.BUILD_DIR }} -G Ninja -DCMAKE_BUILD_TYPE=${{ env.BUILD_TYPE}} -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache . -DCMAKE_SYSTEM_VERSION=10.0.22621.0 -DCMAKE_CXX_FLAGS=" /D_DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR -DJUCE8=ON" else cmake -B ${{ env.BUILD_DIR }} -G Ninja -DCMAKE_BUILD_TYPE=${{ env.BUILD_TYPE}} -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache . -DCMAKE_SYSTEM_VERSION=10.0.22621.0 -DCMAKE_CXX_FLAGS=" /D_DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR" @@ -85,7 +85,7 @@ jobs: - name: Configure if: runner.os != 'Windows' run: | - if [ ${{ matrix.juce }} -eq 8 ]; then + if [ ${{ matrix.juce }} -eq JUCE8 ]; then cmake -B ${{ env.BUILD_DIR }} -G Ninja -DCMAKE_BUILD_TYPE=${{ env.BUILD_TYPE}} -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache . -DJUCE8=ON else cmake -B ${{ env.BUILD_DIR }} -G Ninja -DCMAKE_BUILD_TYPE=${{ env.BUILD_TYPE}} -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache .