diff options
| author | Mukilan Thiyagarajan <mukilan@igalia.com> | 2025-04-07 17:02:32 +0530 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-04-07 11:32:32 +0000 |
| commit | 3c4a4d53dd44aa2a0cb1b0b9f73398f7211fc792 (patch) | |
| tree | 4a812d583c0f91a24bfb40f4203ec8ca239eea07 | |
| parent | 0a4174ad0e5cf681ccf7aad0922a187a507f464e (diff) | |
| download | servo-3c4a4d53dd44aa2a0cb1b0b9f73398f7211fc792.tar.gz servo-3c4a4d53dd44aa2a0cb1b0b9f73398f7211fc792.zip | |
ci: use Ubuntu 22.04 for nightly jobs (#36377)
The upstream PR (web-platform-tests/wpt#51084) to update the WPT.fyi
docker image to 22.04 landed a few days back. No new issues have been
discovered so far in wpt.fyi, so it should be safe for us to move to
22.04 for the nightly builds.
Fixes #35747.
---------
Signed-off-by: Mukilan Thiyagarajan <mukilan@igalia.com>
| -rw-r--r-- | .github/workflows/linux.yml | 18 | ||||
| -rw-r--r-- | Cargo.lock | 4 |
2 files changed, 7 insertions, 15 deletions
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index b8914a2e810..03d863285a7 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -90,10 +90,10 @@ jobs: uses: ./.github/workflows/self-hosted-runner-select.yml secrets: inherit with: - # Ubuntu 22.04 has glibc 2.34 so the binaries produced - # won't run on systems with older glibc e.g wpt.fyi - # runners which still use 20.04. - github-hosted-runner-label: ubuntu-${{ inputs.upload && '20.04' || '22.04' }} + # Before updating the GH action runner image for the nightly job, ensure + # that the system has a glibc version that is compatible with the one + # used by the wpt.fyi runners. + github-hosted-runner-label: ubuntu-22.04 self-hosted-image-name: servo-ubuntu2204 force-github-hosted-runner: ${{ inputs.upload || inputs.force-github-hosted-runner }} runner-timeout: @@ -138,16 +138,8 @@ jobs: tool-cache: false large-packages: false swap-storage: false - - name: Install LLVM and Clang - # Expliclity install Clang 14 on Ubuntu 20.04 used by the nightly job (#34713). - if: ${{ runner.environment != 'self-hosted' && inputs.upload }} - uses: KyleMayes/install-llvm-action@v2 - with: - version: 14 - # FIXME: It would be better to use the above step for regular Linux jobs - # and remove the following step, but currenty that is failing and needs investigation. - name: Set LIBCLANG_PATH env # needed for bindgen in mozangle - if: ${{ runner.environment != 'self-hosted' && !inputs.upload }} # not needed on ubuntu 20.04 used for nightly + if: ${{ runner.environment != 'self-hosted' }} run: echo "LIBCLANG_PATH=/usr/lib/llvm-14/lib" >> $GITHUB_ENV - name: Setup Python if: ${{ runner.environment != 'self-hosted' }} diff --git a/Cargo.lock b/Cargo.lock index 8b3dbf3754b..59bfae185fc 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -7796,9 +7796,9 @@ dependencies = [ [[package]] name = "tokio" -version = "1.44.1" +version = "1.44.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f382da615b842244d4b8738c82ed1275e6c5dd90c459a30941cd07080b06c91a" +checksum = "e6b88822cbe49de4185e3a4cbf8321dd487cf5fe0c5c65695fef6346371e9c48" dependencies = [ "backtrace", "bytes", |