mirror of
https://github.com/servo/servo.git
synced 2025-06-06 00:25:37 +00:00
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>
This commit is contained in:
parent
0a4174ad0e
commit
3c4a4d53dd
2 changed files with 7 additions and 15 deletions
18
.github/workflows/linux.yml
vendored
18
.github/workflows/linux.yml
vendored
|
@ -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' }}
|
||||
|
|
4
Cargo.lock
generated
4
Cargo.lock
generated
|
@ -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",
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue