Skip to content

Commit

Permalink
Merge branch 'develop' of github.com:junkurihara/rust-rpxy into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
junkurihara committed Jun 20, 2024
2 parents b15787c + fd8ee25 commit a353655
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/release_docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ jobs:

# - name: Nightly build test on amd64 for pull requests
# if: ${{ github.event_name == 'pull_request' }}
# uses: docker/build-push-action@v5
# uses: docker/build-push-action@v6
# with:
# context: .
# build-args: ${{ matrix.build-args }}
Expand All @@ -138,7 +138,7 @@ jobs:

- name: Unstable build and push from develop branch
if: ${{ startsWith(github.ref_name, 'feat/') && (github.event_name == 'push') }}
uses: docker/build-push-action@v5
uses: docker/build-push-action@v6
with:
context: .
build-args: ${{ matrix.build-args }}
Expand All @@ -155,7 +155,7 @@ jobs:

- name: Nightly build and push from develop branch
if: ${{ (github.ref_name == 'develop') && (github.event_name == 'push') }}
uses: docker/build-push-action@v5
uses: docker/build-push-action@v6
with:
context: .
build-args: ${{ matrix.build-args }}
Expand All @@ -172,7 +172,7 @@ jobs:

- name: Release build and push from main branch
if: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.ref == 'develop' && github.event.pull_request.base.ref == 'main' && github.event.pull_request.merged == true }}
uses: docker/build-push-action@v5
uses: docker/build-push-action@v6
with:
context: .
build-args: ${{ matrix.build-args }}
Expand Down

0 comments on commit a353655

Please sign in to comment.