Skip to content

Commit

Permalink
CI: don't use environment variables
Browse files Browse the repository at this point in the history
We can just use the values directly
  • Loading branch information
robUx4 committed Jan 5, 2025
1 parent 2731dda commit 07b12dc
Showing 1 changed file with 2 additions and 5 deletions.
7 changes: 2 additions & 5 deletions .github/workflows/generate-tools.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
target: [
{"name": "Linux GCC 14", "os": "ubuntu-latest", "cmake_env": "CC=gcc-14"},
{"name": "Linux Clang 18", "os": "ubuntu-latest", "cmake_env": "CC=clang-18"},
{"name": "Linux GCC 7", "os": "ubuntu-20.04", "cmake_env": "CC=gcc-7", "install": "gcc-7"},
{"name": "Linux GCC 7", "os": "ubuntu-20.04", "cmake_env": "CC=gcc-7", "install": "gcc-7"},
{"name": "Linux Clang 7", "os": "ubuntu-20.04", "cmake_env": "CC=clang-7", "install": "clang-7"},
{"name": "macOS arm64", "os": "macos-15", "cmake_env": "CMAKE_OSX_ARCHITECTURES=arm64"},
{"name": "macOS x86_64", "os": "macos-15", "cmake_env": "CMAKE_OSX_ARCHITECTURES=x86_64"},
Expand All @@ -23,9 +23,6 @@ jobs:
{"name": "Windows Clang-CL", "os": "windows-latest", "cmake_options": "-T ClangCl"},
{"name": "WinArm64 Clang-CL","os": "windows-latest", "cmake_options": "-T ClangCl -A arm64"},
]
env:
CMAKE_OPTIONS: -DDEV_MODE=ON ${{ matrix.target.cmake_options }}
CMAKE_ENV: ${{ matrix.target.cmake_env }}
steps:
- name: list compilers
if: ${{ contains(matrix.target.os, 'ubuntu') }}
Expand All @@ -41,7 +38,7 @@ jobs:
uses: actions/checkout@v4

- name: Configure CMake
run: ${{ env.CMAKE_ENV }} cmake -S . -B _build ${{ env.CMAKE_OPTIONS }}
run: ${{ matrix.target.cmake_env }} cmake -S . -B _build -DDEV_MODE=ON ${{ matrix.target.cmake_options }}

- name: Build with CMake
run: cmake --build _build --config Debug --parallel
Expand Down

0 comments on commit 07b12dc

Please sign in to comment.