Skip to content

Commit

Permalink
Merge branch 'update-workflow-actions'
Browse files Browse the repository at this point in the history
  • Loading branch information
jerith committed Jul 18, 2023
2 parents 89f29aa + 3688434 commit 352447f
Showing 1 changed file with 11 additions and 11 deletions.
22 changes: 11 additions & 11 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,11 @@ jobs:
python: pypy

steps:
- uses: actions/checkout@v2
- uses: docker/setup-buildx-action@v1
- uses: actions/checkout@v3
- uses: docker/setup-buildx-action@v2
- name: construct image metadata
id: meta
uses: docker/metadata-action@v3
uses: docker/metadata-action@v4
with:
images: |
praekeltfoundation/${{matrix.python}}-base
Expand All @@ -55,18 +55,18 @@ jobs:
type=pep440,pattern={{major}}.{{minor}}-${{matrix.dist}},value=${{matrix.version}}
type=pep440,pattern={{major}}-${{matrix.dist}},value=${{matrix.version}}
- name: login to ghcr
uses: docker/login-action@v1
uses: docker/login-action@v2
with:
registry: ghcr.io
username: ${{github.actor}}
password: ${{secrets.GITHUB_TOKEN}}
- name: login to docker hub
uses: docker/login-action@v1
uses: docker/login-action@v2
with:
username: ${{secrets.DOCKER_USERNAME}}
password: ${{secrets.DOCKER_PASSWORD}}
- name: build and push
uses: docker/build-push-action@v2
uses: docker/build-push-action@v4
with:
context: .
push: ${{github.event_name != 'pull_request'}}
Expand All @@ -92,11 +92,11 @@ jobs:
python: pypy

steps:
- uses: actions/checkout@v2
- uses: docker/setup-buildx-action@v1
- uses: actions/checkout@v3
- uses: docker/setup-buildx-action@v2
- name: construct image metadata
id: meta
uses: docker/metadata-action@v3
uses: docker/metadata-action@v4
with:
images: |
ghcr.io/praekeltfoundation/${{matrix.python}}-base-nw
Expand All @@ -109,13 +109,13 @@ jobs:
type=pep440,pattern={{major}}.{{minor}}-${{matrix.dist}},value=${{matrix.version}}
type=pep440,pattern={{major}}-${{matrix.dist}},value=${{matrix.version}}
- name: login to ghcr
uses: docker/login-action@v1
uses: docker/login-action@v2
with:
registry: ghcr.io
username: ${{github.actor}}
password: ${{secrets.GITHUB_TOKEN}}
- name: build and push
uses: docker/build-push-action@v2
uses: docker/build-push-action@v4
with:
context: .
file: Dockerfile.no-wheelhouse
Expand Down

0 comments on commit 352447f

Please sign in to comment.