Skip to content

Commit 5a2f05a

Browse files
delandelan
committed
merge from origin/master
2 parents 1e24ffd + 6fe87c9 commit 5a2f05a

File tree

458 files changed

+9025
-6426
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

458 files changed

+9025
-6426
lines changed

‎.github/workflows/docs.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ on:
77

88
jobs:
99
upload-docs:
10+
# This job is only useful when run on upstream servo.
11+
if: github.repository == 'servo/servo' || github.event_name == 'workflow_dispatch'
1012
name: Upload docs to GitHub Pages
1113
runs-on: ubuntu-20.04
1214
steps:

‎.github/workflows/main.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -219,6 +219,7 @@ jobs:
219219
--log-raw-unexpected unexpected-test-wpt.${{ matrix.chunk_id }}.log \
220220
--filter-intermittents filtered-test-wpt.${{ matrix.chunk_id }}.json
221221
env:
222+
GITHUB_CONTEXT: ${{ toJson(github) }}
222223
INTERMITTENT_TRACKER_DASHBOARD_SECRET: ${{ secrets.INTERMITTENT_TRACKER_DASHBOARD_SECRET }}
223224
- name: Archive filtered results
224225
uses: actions/upload-artifact@v3

‎.github/workflows/nightly-rust.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ env:
1212

1313
jobs:
1414
build-linux-with-rust-nightly:
15+
# This job is only useful when run on upstream servo.
16+
if: github.repository == 'servo/servo' || github.event_name == 'workflow_dispatch'
1517
name: Build (Linux) + rustc nightly
1618
runs-on: ubuntu-20.04
1719
steps:
@@ -27,5 +29,7 @@ jobs:
2729
python3 ./mach bootstrap
2830
- name: Release build
2931
run: python3 ./mach build --release
32+
- name: Smoketest
33+
run: xvfb-run python3 ./mach smoketest
3034
- name: Unit tests
3135
run: python3 ./mach test-unit --release

‎.github/workflows/nightly.yml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ env:
1212

1313
jobs:
1414
upload-linux:
15+
# This job is only useful when run on upstream servo.
16+
if: github.repository == 'servo/servo' || github.event_name == 'workflow_dispatch'
1517
name: Upload nightly (Linux)
1618
runs-on: ubuntu-20.04
1719
steps:
@@ -33,6 +35,8 @@ jobs:
3335
S3_UPLOAD_CREDENTIALS: ${{ secrets.S3_UPLOAD_CREDENTIALS }}
3436

3537
upload-mac:
38+
# This job is only useful when run on upstream servo.
39+
if: github.repository == 'servo/servo' || github.event_name == 'workflow_dispatch'
3640
name: Upload nightly (macOS)
3741
runs-on: macos-12
3842
steps:
@@ -74,6 +78,8 @@ jobs:
7478
GITHUB_HOMEBREW_TOKEN: ${{ secrets.HOMEBREW_TOKEN }}
7579

7680
upload-win:
81+
# This job is only useful when run on upstream servo.
82+
if: github.repository == 'servo/servo' || github.event_name == 'workflow_dispatch'
7783
name: Upload nightly (Windows)
7884
runs-on: windows-2019
7985
steps:

.github/workflows/pull-request.yml renamed to .github/workflows/quick-check.yml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,17 @@
1-
name: Pull request
1+
name: Quick check
22
on:
33
pull_request:
4-
branches: ["**"]
4+
push:
5+
branches:
6+
[ "**", "!auto", "!try", "!try-linux", "!try-mac", "!try-windows", "!try-wpt"]
57

68
env:
79
RUST_BACKTRACE: 1
810
SHELL: /bin/bash
911

1012
jobs:
1113
build-linux:
14+
if: github.repository == 'servo/servo' || github.event_name == 'push'
1215
name: Build (Linux)
1316
runs-on: ubuntu-20.04
1417
steps:
@@ -23,6 +26,8 @@ jobs:
2326
run: python3 ./mach test-tidy --no-progress --all
2427
- name: Release build
2528
run: python3 ./mach build --release
29+
- name: Smoketest
30+
run: xvfb-run python3 ./mach smoketest
2631
- name: Unit tests
2732
run: python3 ./mach test-unit --release
2833
- name: Lockfile check

‎.github/workflows/upstream-wpt-changes.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ on:
55

66
jobs:
77
upstream:
8+
# Run job only on servo/servo
9+
if: github.repository == 'servo/servo'
810
runs-on: ubuntu-latest
911
steps:
1012
- name: Calculate PR fetch depth

‎.github/workflows/wpt-nightly.yml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ on:
1010

1111
jobs:
1212
build-linux:
13+
# This job is only useful when run on upstream servo.
14+
if: github.repository == 'servo/servo' || github.event_name == 'workflow_dispatch'
1315
name: Build on Linux
1416
runs-on: ubuntu-20.04
1517
steps:
@@ -36,6 +38,8 @@ jobs:
3638
path: target.tar.gz
3739

3840
linux-wpt:
41+
# This job is only useful when run on upstream servo.
42+
if: github.repository == 'servo/servo' || github.event_name == 'workflow_dispatch'
3943
name: Linux WPT Tests
4044
runs-on: ubuntu-20.04
4145
needs: ["build-linux"]
@@ -82,6 +86,8 @@ jobs:
8286
wpt-jsonsummary.${{ matrix.chunk_id }}.log
8387
8488
sync:
89+
# This job is only useful when run on upstream servo.
90+
if: github.repository == 'servo/servo' || github.event_name == 'workflow_dispatch'
8591
name: Synchronize WPT Nightly
8692
runs-on: ubuntu-latest
8793
needs:

0 commit comments

Comments
 (0)