diff options
| author | Martin Robinson <mrobinson@igalia.com> | 2023-01-20 13:05:08 +0100 |
|---|---|---|
| committer | Martin Robinson <mrobinson@igalia.com> | 2023-01-20 20:19:27 +0100 |
| commit | 772e086677612f44797c5abdbac4d1f8dfe8f34c (patch) | |
| tree | 97b3d29445ed60b62405b02a0f38cdf4fe457dbe | |
| parent | 3831648df9ec14988ee59ee3430c4bdc57dcb960 (diff) | |
| download | servo-772e086677612f44797c5abdbac4d1f8dfe8f34c.tar.gz servo-772e086677612f44797c5abdbac4d1f8dfe8f34c.zip | |
Enable the Github Action-based WPT upstream script
| -rw-r--r-- | .github/workflows/upstream-wpt-changes.yml | 66 | ||||
| -rwxr-xr-x | etc/ci/upstream-wpt-changes/upstream-wpt-changes.py | 4 |
2 files changed, 34 insertions, 36 deletions
diff --git a/.github/workflows/upstream-wpt-changes.yml b/.github/workflows/upstream-wpt-changes.yml index 8d440194e3d..d53e5715b9d 100644 --- a/.github/workflows/upstream-wpt-changes.yml +++ b/.github/workflows/upstream-wpt-changes.yml @@ -1,34 +1,32 @@ -# Disabled until the previous bot is turned off. -#name: WPT export -#on: -# pull_request: -# types: ['opened', 'synchronize', 'reopened', 'edited', 'closed'] -# -#jobs: -# upstream: -# runs-on: ubuntu-latest -# steps: -# - name: Calculate PR fetch depth -# run: echo "PR_FETCH_DEPTH=$(( ${{ github.event.pull_request.commits }} + 1 ))" >> "${GITHUB_ENV}" -# - name: Check out shallow servo PR -# run: | -# mkdir servo -# cd servo -# git init -b main -# git remote add origin ${{ github.event.repository.clone_url}} -# git fetch origin pull/${{ github.event.pull_request.number}}/head:pr --depth ${{ env.PR_FETCH_DEPTH }} -# git checkout pr -# - name: Check out wpt -# uses: actions/checkout@v3 -# with: -# path: wpt -# repository: 'web-platform-tests/wpt' -# token: ${{ secrets.WPT_UPSTREAM_TOKEN }} -# - name: Install requirements -# run: pip install -r servo/etc/ci/upstream-wpt-changes/requirements.txt -# - name: Process pull request -# run: servo/etc/ci/upstream-wpt-changes/upstream-wpt-changes.py -# env: -# GITHUB_CONTEXT: ${{ toJson(github) }} -# GITHUB_TOKEN: ${{ secrets.WPT_UPSTREAM_TOKEN }} -# +name: WPT export +on: + pull_request: + types: ['opened', 'synchronize', 'reopened', 'edited', 'closed'] + +jobs: + upstream: + runs-on: ubuntu-latest + steps: + - name: Calculate PR fetch depth + run: echo "PR_FETCH_DEPTH=$(( ${{ github.event.pull_request.commits }} + 1 ))" >> "${GITHUB_ENV}" + - name: Check out shallow servo PR + run: | + mkdir servo + cd servo + git init -b main + git remote add origin ${{ github.event.repository.clone_url}} + git fetch origin pull/${{ github.event.pull_request.number}}/head:pr --depth ${{ env.PR_FETCH_DEPTH }} + git checkout pr + - name: Check out wpt + uses: actions/checkout@v3 + with: + path: wpt + repository: 'web-platform-tests/wpt' + token: ${{ secrets.GITHUB_TOKEN }} + - name: Install requirements + run: pip install -r servo/etc/ci/upstream-wpt-changes/requirements.txt + - name: Process pull request + run: servo/etc/ci/upstream-wpt-changes/upstream-wpt-changes.py + env: + GITHUB_CONTEXT: ${{ toJson(github) }} + WPT_SYNC_TOKEN: ${{ secrets.WPT_SYNC_TOKEN }} diff --git a/etc/ci/upstream-wpt-changes/upstream-wpt-changes.py b/etc/ci/upstream-wpt-changes/upstream-wpt-changes.py index 9c5c11ec3b1..202c4b3c479 100755 --- a/etc/ci/upstream-wpt-changes/upstream-wpt-changes.py +++ b/etc/ci/upstream-wpt-changes/upstream-wpt-changes.py @@ -26,11 +26,11 @@ def main() -> int: success = WPTSync( servo_repo='servo/servo', - wpt_repo='servo/wpt', + wpt_repo='web-platform-tests/wpt', downstream_wpt_repo='servo-wpt-sync/web-platform-tests', servo_path='./servo', wpt_path='./wpt', - github_api_token=os.environ['WPT_SYNC_GITHUB_TOKEN'], + github_api_token=os.environ['WPT_SYNC_TOKEN'], github_api_url='https://api.github.com/', github_username='servo-wpt-sync', github_email='josh+wptsync@joshmatthews.net', |