Explicitly set env variables

EmilDohne · Feb 24, 2024 · 6dbd524 · 6dbd524
1 parent 98820cc
commit 6dbd524
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 13 deletions.
diff --git a/.github/workflows/cmake-build.yml b/.github/workflows/cmake-build.yml
@@ -27,11 +27,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, windows-latest, macos-latest]
-        include:
-          - runs-on: ubuntu-latest
-            env:
-              CC: gcc-13
-              CXX: g++-13
+
 
     steps:
     - uses: actions/checkout@v4
@@ -41,10 +37,15 @@ jobs:
     - name: Configure CMake ${{ matrix.os }}
       # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make.
       # See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type
-
+      env:
+        CC: gcc-13
+        CXX: g++-13
       run: |
         cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DPSAPI_BUILD_DOCS=OFF -DPSAPI_BUILD_BENCHMARKS=OFF -DPSAPI_BUILD_TESTS=OFF
 
     - name: Build ${{ matrix.os }}
       # Build your program with the given configuration
+      env:
+        CC: gcc-13
+        CXX: g++-13
       run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}}
diff --git a/.github/workflows/cmake-test.yml b/.github/workflows/cmake-test.yml
@@ -27,11 +27,6 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, windows-latest, macos-latest]
-        include:
-          - runs-on: ubuntu-latest
-            env:
-              CC: gcc-13
-              CXX: g++-13
 
     steps:
     - uses: actions/checkout@v4
@@ -41,15 +36,22 @@ jobs:
     - name: Configure CMake ${{ matrix.os }}
       # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make.
       # See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type
-
+      env:
+        CC: gcc-13
+        CXX: g++-13
       run: |
         cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DPSAPI_BUILD_DOCS=OFF -DPSAPI_BUILD_BENCHMARKS=OFF -DPSAPI_BUILD_EXAMPLES=OFF
 
     - name: Build ${{ matrix.os }}
-      # Build your program with the given configuration
+      env:
+        CC: gcc-13
+        CXX: g++-13
       run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}}
 
     - name: Test ${{ matrix.os }}
+      env:
+        CC: gcc-13
+        CXX: g++-13
       working-directory: ${{github.workspace}}/build/PhotoshopTest
       # Execute tests defined by the CMake configuration.
       # See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail