Add try-wpt-2020 runner

This commit is contained in:
sagudev 2023-04-24 07:54:13 +02:00 committed by Martin Robinson
parent 8bed625d28
commit 200f90cf9f
3 changed files with 7 additions and 7 deletions

View file

@ -39,13 +39,13 @@ on:
default: false default: false
type: boolean type: boolean
push: push:
branches: ["try-linux", "try-wpt"] branches: ["try-linux", "try-wpt", "try-wpt-2020"]
env: env:
RUST_BACKTRACE: 1 RUST_BACKTRACE: 1
SHELL: /bin/bash SHELL: /bin/bash
LAYOUT: "${{ contains(inputs.layout, '2020') && 'layout-2020' || 'layout-2013' }}" LAYOUT: "${{ (contains(inputs.layout, '2020') || github.ref_name == 'try-wpt-2020') && 'layout-2020' || 'layout-2013' }}"
PACKAGE: "${{ contains(inputs.layout, '2020') && 'linux-layout2020' || 'linux' }}" PACKAGE: "${{ (contains(inputs.layout, '2020') || github.ref_name == 'try-wpt-2020') && 'linux-layout2020' || 'linux' }}"
SCCACHE_GHA_ENABLED: "true" SCCACHE_GHA_ENABLED: "true"
RUSTC_WRAPPER: "sccache" RUSTC_WRAPPER: "sccache"
CCACHE: "sccache" CCACHE: "sccache"
@ -102,7 +102,7 @@ jobs:
path: target.tar.gz path: target.tar.gz
linux-wpt: linux-wpt:
if: ${{ github.ref_name == 'try-wpt' || inputs.wpt }} if: ${{ contains(github.ref_name, 'wpt') || inputs.wpt }}
name: Linux WPT Tests name: Linux WPT Tests
runs-on: ubuntu-20.04 runs-on: ubuntu-20.04
needs: ["build-linux"] needs: ["build-linux"]
@ -183,7 +183,7 @@ jobs:
report-test-results: report-test-results:
name: Reporting test results name: Reporting test results
runs-on: ubuntu-latest 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: needs:
- "linux-wpt" - "linux-wpt"
steps: steps:

View file

@ -5,7 +5,7 @@ name: Quick check
on: on:
push: push:
branches: 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: jobs:
build-linux: build-linux:

View file

@ -352,7 +352,7 @@ class MachCommands(CommandBase):
def try_jobs(self, jobs): def try_jobs(self, jobs):
branches = [] branches = []
# we validate branches because force pushing is destructive # 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: for job in jobs:
# branches must start with try- # branches must start with try-
if "try" not in job: if "try" not in job: