From 27370e9fc77c8d99f047ab53e17e84a6e7255c63 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Thu, 18 Jun 2026 19:39:33 +0200 Subject: [PATCH] GHA: bump some jobs to ubuntu-26.04 In jobs that may benefit from newer tool versions (pyspelling, possibly CodeQL, CM integration, configure-vs-cmake). Also curl-for-win to match the curl/curl-for-win repo that also bumped. Bump some Linux jobs to add variation. Also the rest of `check*` jobs for no particular reason other than using the latest. Follow-up to 8f5e4f020e79ec1fd1e8540bdea3c1c20030405b #22097 Follow-up to 139ce4d37cfdc3126179bdb166ec61a095360c62 #22096 Follow-up to e44f1a1446f8e72573e5a1026807e71a0495f88d #22094 Closes #22092 --- .github/workflows/checkdocs.yml | 6 +++--- .github/workflows/checksrc.yml | 4 ++-- .github/workflows/codeql.yml | 4 ++-- .github/workflows/configure-vs-cmake.yml | 2 +- .github/workflows/curl-for-win.yml | 10 +++++----- .github/workflows/distcheck.yml | 2 +- .github/workflows/linux.yml | 10 +++++----- 7 files changed, 19 insertions(+), 19 deletions(-) diff --git a/.github/workflows/checkdocs.yml b/.github/workflows/checkdocs.yml index 52f002fa71..446aa4668f 100644 --- a/.github/workflows/checkdocs.yml +++ b/.github/workflows/checkdocs.yml @@ -41,7 +41,7 @@ jobs: # config file help: https://github.com/amperser/proselint/ proselint: name: 'proselint' - runs-on: ubuntu-24.04-arm + runs-on: ubuntu-26.04-arm steps: - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 with: @@ -92,7 +92,7 @@ jobs: pyspelling: name: 'pyspelling' - runs-on: ubuntu-latest + runs-on: ubuntu-26.04 steps: - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 with: @@ -122,7 +122,7 @@ jobs: synopsis-man-examples: name: 'synopsis, man-examples' - runs-on: ubuntu-24.04-arm + runs-on: ubuntu-26.04-arm steps: - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 with: diff --git a/.github/workflows/checksrc.yml b/.github/workflows/checksrc.yml index 83f5afe7a1..405e66af45 100644 --- a/.github/workflows/checksrc.yml +++ b/.github/workflows/checksrc.yml @@ -46,7 +46,7 @@ jobs: linters: name: 'spellcheck, linters, REUSE' - runs-on: ubuntu-24.04-arm + runs-on: ubuntu-26.04-arm steps: - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 with: @@ -160,7 +160,7 @@ jobs: miscchecks: name: 'misc checks' - runs-on: ubuntu-24.04-arm + runs-on: ubuntu-26.04-arm timeout-minutes: 5 steps: - name: 'install prereqs' diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 15b91c18c4..ea70149538 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -40,7 +40,7 @@ jobs: gha_python: if: ${{ github.repository_owner == 'curl' || github.event_name != 'schedule' }} name: 'GHA and Python' - runs-on: ubuntu-latest + runs-on: ubuntu-26.04 permissions: security-events: write # To create/update security events steps: @@ -60,7 +60,7 @@ jobs: c: if: ${{ github.repository_owner == 'curl' || github.event_name != 'schedule' }} name: 'C' - runs-on: ${{ matrix.platform == 'Linux' && 'ubuntu-latest' || 'windows-2022' }} + runs-on: ${{ matrix.platform == 'Linux' && 'ubuntu-26.04' || 'windows-2022' }} permissions: security-events: write # To create/update security events strategy: diff --git a/.github/workflows/configure-vs-cmake.yml b/.github/workflows/configure-vs-cmake.yml index bcab34395f..2c20423810 100644 --- a/.github/workflows/configure-vs-cmake.yml +++ b/.github/workflows/configure-vs-cmake.yml @@ -142,7 +142,7 @@ jobs: check-windows: name: 'Windows' - runs-on: ubuntu-latest + runs-on: ubuntu-26.04 env: TRIPLET: 'x86_64-w64-mingw32' steps: diff --git a/.github/workflows/curl-for-win.yml b/.github/workflows/curl-for-win.yml index 2f47321a19..23e10decc1 100644 --- a/.github/workflows/curl-for-win.yml +++ b/.github/workflows/curl-for-win.yml @@ -41,7 +41,7 @@ env: jobs: linux-glibc-gcc: name: 'Linux gcc glibc (amd64, arm64)' - runs-on: ubuntu-latest + runs-on: ubuntu-26.04 timeout-minutes: 10 steps: - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 @@ -70,7 +70,7 @@ jobs: linux-glibc-gcc-minimal: # use gcc to minimize installed packages name: 'Linux gcc glibc minimal (amd64)' - runs-on: ubuntu-latest + runs-on: ubuntu-26.04 timeout-minutes: 5 steps: - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 @@ -97,7 +97,7 @@ jobs: linux-musl-llvm: name: 'Linux llvm MUSL (amd64, riscv64)' - runs-on: ubuntu-latest + runs-on: ubuntu-26.04 timeout-minutes: 10 steps: - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 @@ -146,7 +146,7 @@ jobs: win-llvm: name: 'Windows llvm (x64)' - runs-on: ubuntu-latest + runs-on: ubuntu-26.04 timeout-minutes: 10 steps: - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 @@ -173,7 +173,7 @@ jobs: win-gcc-zlibold-x64: name: 'Windows gcc zlib-classic (x64)' - runs-on: ubuntu-latest + runs-on: ubuntu-26.04 timeout-minutes: 10 steps: - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 diff --git a/.github/workflows/distcheck.yml b/.github/workflows/distcheck.yml index 6aa969cd0f..e3d37902d7 100644 --- a/.github/workflows/distcheck.yml +++ b/.github/workflows/distcheck.yml @@ -266,7 +266,7 @@ jobs: strategy: fail-fast: false matrix: - image: [ubuntu-24.04-arm, macos-latest, windows-2022] + image: [ubuntu-26.04-arm, macos-latest, windows-2022] steps: - uses: msys2/setup-msys2@e9898307ac31d1a803454791be09ab9973336e1c # v2.31.1 if: ${{ contains(matrix.image, 'windows') }} diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index fd8a430c27..8d9c1cd55d 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -189,13 +189,13 @@ jobs: configure: --with-rustls --enable-ech --enable-debug - name: 'wolfssl-all' - image: ubuntu-24.04-arm + image: ubuntu-26.04-arm install_steps: wolfssl-all-arm LDFLAGS: -Wl,-rpath,/home/runner/wolfssl-all/lib configure: --with-wolfssl=/home/runner/wolfssl-all --enable-ech --enable-debug - name: 'wolfssl-opensslextra valgrind 1' - image: ubuntu-24.04-arm + image: ubuntu-26.04-arm install_packages: valgrind install_steps: wolfssl-opensslextra-arm tflags: '--min=815 1 to 1000' @@ -203,7 +203,7 @@ jobs: configure: --with-wolfssl=/home/runner/wolfssl-opensslextra --enable-ech --enable-debug - name: 'wolfssl-opensslextra valgrind 2' - image: ubuntu-24.04-arm + image: ubuntu-26.04-arm install_packages: valgrind install_steps: wolfssl-opensslextra-arm tflags: '--min=835 1001 to 9999' @@ -314,7 +314,7 @@ jobs: --with-openssl --with-libssh2 --with-libidn2 --enable-ares --enable-debug - name: '!ssl !http !smtp !imap' - image: ubuntu-24.04-arm + image: ubuntu-26.04-arm tflags: '--min=500' configure: --without-ssl --enable-debug --disable-http --disable-smtp --disable-imap --disable-unity @@ -434,7 +434,7 @@ jobs: tflags: '-n --test-event --min=1420' - name: 'duphandle' - image: ubuntu-24.04-arm + image: ubuntu-26.04-arm install_packages: libssh-dev configure: --enable-debug --enable-static --disable-shared --disable-threaded-resolver --with-libssh --with-openssl tflags: '-n --test-duphandle'