Skip to content

Commit

Permalink
Merge pull request #9777 from poikilotherm/9769-fix-docker-push
Browse files Browse the repository at this point in the history
9769 fix docker push
  • Loading branch information
kcondon authored Aug 14, 2023
2 parents 7e18f9c + b8e116a commit 1c356b4
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 5 deletions.
10 changes: 7 additions & 3 deletions .github/workflows/container_app_push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -99,8 +99,12 @@ jobs:
name: "Package & Publish"
runs-on: ubuntu-latest
# Only run this job if we have access to secrets. This is true for events like push/schedule which run in
# context of main repo, but for PRs only true if coming from the main repo! Forks have no secret access.
if: needs.check-secrets.outputs.available == 'true'
# context of the main repo, but for PRs only true if coming from the main repo! Forks have no secret access.
#
# Note: The team's decision was to not auto-deploy an image on any git push where no PR exists (yet).
# Accordingly, only run for push events on branches develop and master.
if: needs.check-secrets.outputs.available == 'true' &&
( github.event_name != 'push' || ( github.event_name == 'push' && contains(fromJSON('["develop", "master"]'), github.ref_name)))
steps:
- uses: actions/checkout@v3
- uses: actions/setup-java@v3
Expand All @@ -109,7 +113,7 @@ jobs:
distribution: temurin

# Depending on context, we push to different targets. Login accordingly.
- if: ${{ github.event_name != 'pull_request' }}
- if: github.event_name != 'pull_request'
name: Log in to Docker Hub registry
uses: docker/login-action@v2
with:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/spi_release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@ name: Dataverse SPI

on:
push:
branch:
branches:
- "develop"
paths:
- "modules/dataverse-spi/**"
pull_request:
branch:
branches:
- "develop"
paths:
- "modules/dataverse-spi/**"
Expand Down

0 comments on commit 1c356b4

Please sign in to comment.