From 5596de8081970a6fa811b95e60a27dca071a714e Mon Sep 17 00:00:00 2001 From: Asher Gomez Date: Fri, 16 Feb 2024 14:32:28 +1100 Subject: chore: move `test_util/wpt` to `tests/wpt/suite` (#22412) As discussed with @mmastrac. I'll move `tools/wpt` to `tests/wpt` in a follow-up PR. --------- Co-authored-by: Matt Mastracci --- .github/workflows/ci.generate.ts | 4 ++-- .github/workflows/ci.yml | 6 +++--- .github/workflows/wpt_epoch.yml | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) (limited to '.github/workflows') diff --git a/.github/workflows/ci.generate.ts b/.github/workflows/ci.generate.ts index f406cd93f..65d051cbd 100755 --- a/.github/workflows/ci.generate.ts +++ b/.github/workflows/ci.generate.ts @@ -447,7 +447,7 @@ const ci = { ...cloneRepoStep, submoduleStep("./tests/util/std"), { - ...submoduleStep("./test_util/wpt"), + ...submoduleStep("./tests/wpt/suite"), if: "matrix.wpt", }, { @@ -833,7 +833,7 @@ const ci = { name: "Configure hosts file for WPT", if: "matrix.wpt", run: "./wpt make-hosts-file | sudo tee -a /etc/hosts", - "working-directory": "test_util/wpt/", + "working-directory": "tests/wpt/suite/", }, { name: "Run web platform tests (debug)", diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 152fa1f04..1872f4d3a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -152,8 +152,8 @@ jobs: - name: Clone submodule ./tests/util/std run: git submodule update --init --recursive --depth=1 -- ./tests/util/std if: '!(matrix.skip)' - - name: Clone submodule ./test_util/wpt - run: git submodule update --init --recursive --depth=1 -- ./test_util/wpt + - name: Clone submodule ./tests/wpt/suite + run: git submodule update --init --recursive --depth=1 -- ./tests/wpt/suite if: '!(matrix.skip) && (matrix.wpt)' - name: Clone submodule ./tools/node_compat/node run: git submodule update --init --recursive --depth=1 -- ./tools/node_compat/node @@ -506,7 +506,7 @@ jobs: - name: Configure hosts file for WPT if: '!(matrix.skip) && (matrix.wpt)' run: ./wpt make-hosts-file | sudo tee -a /etc/hosts - working-directory: test_util/wpt/ + working-directory: tests/wpt/suite/ - name: Run web platform tests (debug) if: '!(matrix.skip) && (matrix.wpt && matrix.profile == ''debug'')' env: diff --git a/.github/workflows/wpt_epoch.yml b/.github/workflows/wpt_epoch.yml index d44d940f0..ab4a2ec4d 100644 --- a/.github/workflows/wpt_epoch.yml +++ b/.github/workflows/wpt_epoch.yml @@ -45,7 +45,7 @@ jobs: deno --version - name: Switch WPT submodule to epochs/daily - working-directory: test_util/wpt/ + working-directory: tests/wpt/suite/ shell: bash run: | git remote set-branches origin '*' @@ -55,12 +55,12 @@ jobs: - name: Configure hosts file for WPT (unix) if: runner.os != 'Windows' - working-directory: test_util/wpt/ + working-directory: tests/wpt/suite/ run: ./wpt make-hosts-file | sudo tee -a /etc/hosts - name: Configure hosts file for WPT (windows) if: runner.os == 'Windows' - working-directory: test_util/wpt/ + working-directory: tests/wpt/suite/ run: python wpt make-hosts-file | Out-File $env:SystemRoot\System32\drivers\etc\hosts -Encoding ascii -Append - name: Run web platform tests -- cgit v1.2.3