diff options
| -rw-r--r-- | .github/workflows/linux.yml | 10 | ||||
| -rw-r--r-- | .github/workflows/quick-check.yml | 2 | ||||
| -rw-r--r-- | python/servo/devenv_commands.py | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index feca54e326c..6a9561d4a36 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -39,13 +39,13 @@ on: default: false type: boolean push: - branches: ["try-linux", "try-wpt"] + branches: ["try-linux", "try-wpt", "try-wpt-2020"] env: RUST_BACKTRACE: 1 SHELL: /bin/bash - LAYOUT: "${{ contains(inputs.layout, '2020') && 'layout-2020' || 'layout-2013' }}" - PACKAGE: "${{ contains(inputs.layout, '2020') && 'linux-layout2020' || 'linux' }}" + LAYOUT: "${{ (contains(inputs.layout, '2020') || github.ref_name == 'try-wpt-2020') && 'layout-2020' || 'layout-2013' }}" + PACKAGE: "${{ (contains(inputs.layout, '2020') || github.ref_name == 'try-wpt-2020') && 'linux-layout2020' || 'linux' }}" SCCACHE_GHA_ENABLED: "true" RUSTC_WRAPPER: "sccache" CCACHE: "sccache" @@ -102,7 +102,7 @@ jobs: path: target.tar.gz linux-wpt: - if: ${{ github.ref_name == 'try-wpt' || inputs.wpt }} + if: ${{ contains(github.ref_name, 'wpt') || inputs.wpt }} name: Linux WPT Tests runs-on: ubuntu-20.04 needs: ["build-linux"] @@ -183,7 +183,7 @@ jobs: report-test-results: name: Reporting test results runs-on: ubuntu-latest - if: ${{ always() && !cancelled() && success('build-linux') && (github.ref_name == 'try-wpt' || inputs.wpt == 'test') }} + if: ${{ always() && !cancelled() && success('build-linux') && (contains(github.ref_name, 'wpt') || inputs.wpt == 'test') }} needs: - "linux-wpt" steps: diff --git a/.github/workflows/quick-check.yml b/.github/workflows/quick-check.yml index a1244b6b9ce..0c48233c83d 100644 --- a/.github/workflows/quick-check.yml +++ b/.github/workflows/quick-check.yml @@ -5,7 +5,7 @@ name: Quick check on: push: branches: - ["**", "!master", "!auto", "!try", "!try-linux", "!try-mac", "!try-windows", "!try-wpt", "!dependabot/**"] + ["**", "!master", "!auto", "!try", "!try-linux", "!try-mac", "!try-windows", "!try-wpt", "!try-wpt-2020", "!dependabot/**"] jobs: build-linux: diff --git a/python/servo/devenv_commands.py b/python/servo/devenv_commands.py index 47df6599b92..7d3481d1c19 100644 --- a/python/servo/devenv_commands.py +++ b/python/servo/devenv_commands.py @@ -352,7 +352,7 @@ class MachCommands(CommandBase): def try_jobs(self, jobs): branches = [] # we validate branches because force pushing is destructive - VALID_TRY_BRACHES = ["try", "try-linux", "try-mac", "try-windows", "try-wpt"] + VALID_TRY_BRACHES = ["try", "try-linux", "try-mac", "try-windows", "try-wpt", "try-wpt-2020"] for job in jobs: # branches must start with try- if "try" not in job: |