Skip to content

Commit

Permalink
Update GH runners to Ubuntu 24.04
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
blapie committed Oct 24, 2024
1 parent 38fce14 commit f81f956
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 19 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build-as-subproject.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ env:
jobs:
build-nested:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
strategy:
fail-fast: false

Expand Down Expand Up @@ -80,7 +80,7 @@ jobs:
if: always()

build-submodule:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
strategy:
fail-fast: false

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build-examples.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ env:
jobs:
build-native:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
strategy:
fail-fast: false

Expand Down Expand Up @@ -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
Expand Down
24 changes: 9 additions & 15 deletions .github/workflows/build_and_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down Expand Up @@ -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 \
Expand Down Expand Up @@ -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 }}
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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: |
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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"
Expand All @@ -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:
Expand All @@ -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
Expand Down

0 comments on commit f81f956

Please sign in to comment.