diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index dca8067..8255afe 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -20,18 +20,14 @@ jobs: matrix: os: [ubuntu-latest] compiler: [gcc] - gcc_version: [12, 13, 14] + gcc_version: [13, 14] bazel_config: [asan, cpp23, opt] # Using `include` does not make the options show up in the generated config names... exclude: - bazel_config: asan gcc_version: 13 - - bazel_config: asan - gcc_version: 12 - bazel_config: cpp23 gcc_version: 13 - - bazel_config: cpp23 - gcc_version: 12 uses: ./.github/workflows/test.yml with: diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 95f9624..bddf262 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -61,11 +61,13 @@ jobs: steps: - uses: actions/checkout@v4 - uses: bazelbuild/setup-bazelisk@v3 - - uses: egor-tensin/setup-gcc@v1 + - name: Install GCC if: ${{inputs.compiler == 'gcc' && inputs.gcc_version != ''}} - with: - version: ${{inputs.gcc_version}} - platform: ${{runner.arch}} + run: | + sudo apt update + sudo apt install gcc-${{inputs.gcc_version}} g++-${{inputs.gcc_version}} + sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-${{inputs.gcc_version}} 100 --slave /usr/bin/g++ g++ /usr/bin/g++-${{inputs.gcc_version}} --slave /usr/bin/gcov gcov /usr/bin/gcov-${{inputs.gcc_version}} + sudo update-alternatives --set gcc /usr/bin/gcc-${{inputs.gcc_version}} - uses: actions/cache/restore@v4 id: cache_restore