diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b6e3d98e..ea304fe2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -37,6 +37,8 @@ jobs: CC: aarch64-linux-gnu - arch: armel CC: arm-linux-gnueabi + # Ubuntu 26.04 has no crossbuild-essential-armel + packages: gcc-arm-linux-gnueabi libc6-dev-armel-cross - arch: armhf CC: arm-linux-gnueabihf - arch: i386 @@ -65,7 +67,8 @@ jobs: CC: riscv64-linux-gnu - arch: s390x CC: s390x-linux-gnu - runs-on: ${{ matrix.arch == 'i386' && 'ubuntu-22.04' || 'ubuntu-24.04' }} + # Ubuntu 26.04 no longer ships the MIPS cross toolchains. + runs-on: ${{ startsWith(matrix.arch, 'mips') && 'ubuntu-24.04' || 'ubuntu-26.04' }} env: AR: ${{ matrix.CC }}-ar CHOST: ${{ matrix.CC }} @@ -81,7 +84,8 @@ jobs: - name: Install packages run: | sudo apt-get update - sudo apt-get install -y automake autoconf libtool crossbuild-essential-${{ matrix.arch }} + sudo apt-get install -y automake autoconf libtool \ + ${{ matrix.packages || format('crossbuild-essential-{0}', matrix.arch) }} - name: Build run: | autoreconf -i diff --git a/.github/workflows/decnum.yml b/.github/workflows/decnum.yml index 4f7af7a0..364f1413 100644 --- a/.github/workflows/decnum.yml +++ b/.github/workflows/decnum.yml @@ -7,7 +7,7 @@ on: jobs: disabled: - runs-on: ubuntu-24.04 + runs-on: ubuntu-26.04 steps: - name: Clone repository uses: actions/checkout@v7 diff --git a/.github/workflows/oniguruma.yml b/.github/workflows/oniguruma.yml index 47ed62c5..c46b50bd 100644 --- a/.github/workflows/oniguruma.yml +++ b/.github/workflows/oniguruma.yml @@ -9,7 +9,7 @@ on: # we test other options for --with-oniguruma here. jobs: installed: - runs-on: ubuntu-24.04 + runs-on: ubuntu-26.04 steps: - name: Clone repository uses: actions/checkout@v7 @@ -42,7 +42,7 @@ jobs: tests/*.log disabled: - runs-on: ubuntu-24.04 + runs-on: ubuntu-26.04 steps: - name: Clone repository uses: actions/checkout@v7 diff --git a/.github/workflows/valgrind.yml b/.github/workflows/valgrind.yml index 0d068ce3..42e50d3b 100644 --- a/.github/workflows/valgrind.yml +++ b/.github/workflows/valgrind.yml @@ -7,7 +7,7 @@ on: jobs: linux: - runs-on: ubuntu-24.04 + runs-on: ubuntu-26.04 steps: - name: Clone repository uses: actions/checkout@v7