mirror of
https://github.com/servo/servo.git
synced 2025-07-27 17:20:36 +01:00
Auto merge of #29238 - servo:ci-fail-install-deps, r=jdm
Fail faster on CI when Linux bootstrap fails Raise an exception when dependencies fail to install. Also split the run phase of the Linux bootstrap so that either of these failing commands will cause the job to fail. <!-- Please describe your changes on the following line: --> --- <!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `___` with appropriate data: --> - [x] `./mach build -d` does not report any errors - [x] `./mach test-tidy` does not report any errors - [x] These changes do not require tests because they just change minor script issues.
This commit is contained in:
commit
5a33a91bc9
3 changed files with 14 additions and 14 deletions
9
.github/workflows/main.yml
vendored
9
.github/workflows/main.yml
vendored
|
@ -222,11 +222,10 @@ jobs:
|
||||||
- uses: actions/checkout@v3
|
- uses: actions/checkout@v3
|
||||||
with:
|
with:
|
||||||
fetch-depth: 2
|
fetch-depth: 2
|
||||||
- name: Bootstrap
|
- name: Bootstrap Python
|
||||||
run: |
|
run: python3 -m pip install --upgrade pip virtualenv
|
||||||
python3 -m pip install --upgrade pip virtualenv
|
- name: Bootstrap dependencies
|
||||||
sudo apt update
|
run: sudo apt update && python3 ./mach bootstrap
|
||||||
python3 ./mach bootstrap
|
|
||||||
- name: Release build
|
- name: Release build
|
||||||
run: python3 ./mach build --release
|
run: python3 ./mach build --release
|
||||||
- name: Lockfile check
|
- name: Lockfile check
|
||||||
|
|
9
.github/workflows/pull-request.yml
vendored
9
.github/workflows/pull-request.yml
vendored
|
@ -15,11 +15,10 @@ jobs:
|
||||||
- uses: actions/checkout@v3
|
- uses: actions/checkout@v3
|
||||||
with:
|
with:
|
||||||
fetch-depth: 2
|
fetch-depth: 2
|
||||||
- name: Bootstrap
|
- name: Bootstrap Python
|
||||||
run: |
|
run: python3 -m pip install --upgrade pip virtualenv
|
||||||
python3 -m pip install --upgrade pip virtualenv
|
- name: Bootstrap dependencies
|
||||||
sudo apt update
|
run: sudo apt update && python3 ./mach bootstrap
|
||||||
python3 ./mach bootstrap
|
|
||||||
- name: Release build
|
- name: Release build
|
||||||
run: python3 ./mach build --release
|
run: python3 ./mach build --release
|
||||||
- name: Unit tests
|
- name: Unit tests
|
||||||
|
|
|
@ -59,11 +59,13 @@ def install_linux_deps(context, pkgs_ubuntu, pkgs_fedora, pkgs_void, force):
|
||||||
install = force = True
|
install = force = True
|
||||||
break
|
break
|
||||||
|
|
||||||
if install:
|
if not install:
|
||||||
print("Installing missing dependencies...")
|
return False
|
||||||
run_as_root(command + pkgs, force)
|
|
||||||
|
|
||||||
return install
|
print("Installing missing dependencies...")
|
||||||
|
if run_as_root(command + pkgs, force) != 0:
|
||||||
|
raise Exception("Installation of dependencies failed.")
|
||||||
|
return True
|
||||||
|
|
||||||
|
|
||||||
def install_salt_dependencies(context, force):
|
def install_salt_dependencies(context, force):
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue