Skip to content

Commit cbf6df0

Browse files
mukilanTG199
authored andcommitted
ci: use Ubuntu 22.04 for nightly jobs (servo#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 servo#35747. --------- Signed-off-by: Mukilan Thiyagarajan <[email protected]>
1 parent f1958ce commit cbf6df0

File tree

2 files changed

+7
-15
lines changed

2 files changed

+7
-15
lines changed

.github/workflows/linux.yml

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -90,10 +90,10 @@ jobs:
9090
uses: ./.github/workflows/self-hosted-runner-select.yml
9191
secrets: inherit
9292
with:
93-
# Ubuntu 22.04 has glibc 2.34 so the binaries produced
94-
# won't run on systems with older glibc e.g wpt.fyi
95-
# runners which still use 20.04.
96-
github-hosted-runner-label: ubuntu-${{ inputs.upload && '20.04' || '22.04' }}
93+
# Before updating the GH action runner image for the nightly job, ensure
94+
# that the system has a glibc version that is compatible with the one
95+
# used by the wpt.fyi runners.
96+
github-hosted-runner-label: ubuntu-22.04
9797
self-hosted-image-name: servo-ubuntu2204
9898
force-github-hosted-runner: ${{ inputs.upload || inputs.force-github-hosted-runner }}
9999
runner-timeout:
@@ -138,16 +138,8 @@ jobs:
138138
tool-cache: false
139139
large-packages: false
140140
swap-storage: false
141-
- name: Install LLVM and Clang
142-
# Expliclity install Clang 14 on Ubuntu 20.04 used by the nightly job (#34713).
143-
if: ${{ runner.environment != 'self-hosted' && inputs.upload }}
144-
uses: KyleMayes/install-llvm-action@v2
145-
with:
146-
version: 14
147-
# FIXME: It would be better to use the above step for regular Linux jobs
148-
# and remove the following step, but currenty that is failing and needs investigation.
149141
- name: Set LIBCLANG_PATH env # needed for bindgen in mozangle
150-
if: ${{ runner.environment != 'self-hosted' && !inputs.upload }} # not needed on ubuntu 20.04 used for nightly
142+
if: ${{ runner.environment != 'self-hosted' }}
151143
run: echo "LIBCLANG_PATH=/usr/lib/llvm-14/lib" >> $GITHUB_ENV
152144
- name: Setup Python
153145
if: ${{ runner.environment != 'self-hosted' }}

Cargo.lock

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)