Skip to content

Commit

Permalink
Revert "Use the new docker image on PRs that change it"
Browse files Browse the repository at this point in the history
This reverts commit 2d1a64f.
  • Loading branch information
past committed Nov 1, 2024
1 parent 687c217 commit 6c4baca
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 12 deletions.
6 changes: 1 addition & 5 deletions .github/actions/make-in-docker/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,9 @@ inputs:
target:
description: Target to make
required: true
tag:
description: 'Docker image tag to use'
required: false
default: 'latest'
runs:
using: docker
image: "docker://webplatformtests/wpt.fyi:$INPUT_TAG"
image: docker://webplatformtests/wpt.fyi:latest
args:
- /usr/bin/make
- ${{ inputs.target }}
8 changes: 1 addition & 7 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ jobs:
- uses: ./.github/actions/make-in-docker
with:
target: lint
tag: ${{ github.ref_name }}
python_test:
runs-on: ubuntu-latest
steps:
Expand All @@ -38,7 +37,6 @@ jobs:
- uses: ./.github/actions/make-in-docker
with:
target: python_test
tag: ${{ github.ref_name }}
go_test:
runs-on: ubuntu-latest
steps:
Expand All @@ -55,7 +53,6 @@ jobs:
- uses: ./.github/actions/make-in-docker
with:
target: go_test
tag: ${{ github.ref_name }}
web_components_test:
runs-on: ubuntu-latest
steps:
Expand All @@ -72,7 +69,6 @@ jobs:
- uses: ./.github/actions/make-in-docker
with:
target: web_components_test
tag: ${{ github.ref_name }}
go_chrome_test:
runs-on: ubuntu-latest
steps:
Expand All @@ -89,7 +85,6 @@ jobs:
- uses: ./.github/actions/make-in-docker
with:
target: go_chrome_test
tag: ${{ github.ref_name }}
go_firefox_test:
runs-on: ubuntu-latest
steps:
Expand All @@ -106,7 +101,6 @@ jobs:
- uses: ./.github/actions/make-in-docker
with:
target: go_firefox_test
tag: ${{ github.ref_name }}
go_cloud_test:
# This job uses real Cloud resources.
# This means this CI job will have access to the service account.
Expand All @@ -119,7 +113,7 @@ jobs:
needs: [go_test, go_chrome_test, go_firefox_test]
runs-on: ubuntu-latest
env:
DOCKER_IMAGE: webplatformtests/wpt.fyi:${{ github.ref_name }}
DOCKER_IMAGE: webplatformtests/wpt.fyi:latest
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
steps:
- uses: actions/checkout@v4
Expand Down

0 comments on commit 6c4baca

Please sign in to comment.