From f81f9565be071499f8d5576207762ac88463f261 Mon Sep 17 00:00:00 2001 From: Pierre Blanchard Date: Thu, 24 Oct 2024 10:16:38 +0000 Subject: [PATCH] Update GH runners to Ubuntu 24.04 This will ultimately unlock the use of latest versions of gcc 12, then gcc 13, and finally gcc 14. Gcc 14 will unlock more testing. This PR does not update version of gcc yet, just to make sure old version still pass tests. Remove some expensive tests. --- .github/workflows/build-as-subproject.yml | 4 ++-- .github/workflows/build-examples.yml | 4 ++-- .github/workflows/build_and_test.yml | 24 +++++++++-------------- 3 files changed, 13 insertions(+), 19 deletions(-) diff --git a/.github/workflows/build-as-subproject.yml b/.github/workflows/build-as-subproject.yml index de1ef11b..777d9cab 100644 --- a/.github/workflows/build-as-subproject.yml +++ b/.github/workflows/build-as-subproject.yml @@ -23,7 +23,7 @@ env: jobs: build-nested: - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 strategy: fail-fast: false @@ -80,7 +80,7 @@ jobs: if: always() build-submodule: - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 strategy: fail-fast: false diff --git a/.github/workflows/build-examples.yml b/.github/workflows/build-examples.yml index 4edcb308..c3274a22 100644 --- a/.github/workflows/build-examples.yml +++ b/.github/workflows/build-examples.yml @@ -24,7 +24,7 @@ env: jobs: build-native: - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 strategy: fail-fast: false @@ -59,7 +59,7 @@ jobs: if: always() examples-native: - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 needs: [build-native] strategy: fail-fast: false diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml index 702db0a9..68e51b52 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -39,7 +39,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-latest, ah-ubuntu_22_04-c7g_2x-50] + os: [ubuntu-24.04, ah-ubuntu_22_04-c7g_2x-50] compiler: [gcc, llvm] name: build-native-${{ matrix.os }}-${{ matrix.compiler }} @@ -69,7 +69,7 @@ jobs: - name: Set x86_64 config shell: bash -ex -o pipefail {0} - if: ${{ matrix.os == 'ubuntu-latest' }} + if: ${{ matrix.os == 'ubuntu-24.04' }} run: | export EXTRA_CMAKE_FLAGS="\ -DSLEEF_ENFORCE_SSE2=ON -DSLEEF_ENFORCE_SSE4=ON \ @@ -114,7 +114,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-latest, ah-ubuntu_22_04-c7g_2x-50] + os: [ubuntu-24.04, ah-ubuntu_22_04-c7g_2x-50] compiler: [gcc, llvm] name: test-native-${{ matrix.os }}-${{ matrix.compiler }} @@ -155,7 +155,7 @@ jobs: if: always() build-cross: - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 needs: [build-native] strategy: fail-fast: false @@ -224,10 +224,10 @@ jobs: rm -rf sysroot/usr/libexec/gcc if: steps.check-sysroot-cache.outputs.cache-hit != 'true' - - name: Download build-native-ubuntu-latest-${{ matrix.compiler }} artifacts + - name: Download build-native-ubuntu-24.04-${{ matrix.compiler }} artifacts uses: actions/download-artifact@v3 with: - name: build-native-ubuntu-latest-${{ matrix.compiler }} + name: build-native-ubuntu-24.04-${{ matrix.compiler }} - name: Fix _build-native permissions run: | @@ -271,7 +271,7 @@ jobs: test-cross: if: github.event_name == 'push' && github.ref_name == 'master' - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 needs: [build-native, build-cross] strategy: fail-fast: false @@ -311,9 +311,6 @@ jobs: # - arch: riscv64 # compiler: gcc # qemu_cpu: "rv64,zba=true,zbb=true,zbs=true,v=true,vlen=256,elen=64,vext_spec=v1.0" - # - arch: riscv64 - # compiler: gcc - # qemu_cpu: "rv64,zba=true,zbb=true,zbs=true,v=true,vlen=512,elen=64,vext_spec=v1.0" - arch: riscv64 compiler: llvm qemu_cpu: "rv64,zba=true,zbb=true,zbs=true,v=false" @@ -323,9 +320,6 @@ jobs: - arch: riscv64 compiler: llvm qemu_cpu: "rv64,zba=true,zbb=true,zbs=true,v=true,vlen=256,elen=64,vext_spec=v1.0" - - arch: riscv64 - compiler: llvm - qemu_cpu: "rv64,zba=true,zbb=true,zbs=true,v=true,vlen=512,elen=64,vext_spec=v1.0" name: "test-${{ matrix.arch }}-${{ matrix.compiler }} (qemu_cpu: \"${{ matrix.qemu_cpu }}\")" steps: @@ -345,10 +339,10 @@ jobs: run: | cat /proc/cpuinfo - - name: Download build-native-ubuntu-latest-${{ matrix.compiler }} artifacts + - name: Download build-native-ubuntu-24.04-${{ matrix.compiler }} artifacts uses: actions/download-artifact@v3 with: - name: build-native-ubuntu-latest-${{ matrix.compiler }} + name: build-native-ubuntu-24.04-${{ matrix.compiler }} - name: Download build-${{ matrix.arch }}-${{ matrix.compiler }} artifacts uses: actions/download-artifact@v3