Skip to content

Commit

Permalink
Workflow updates
Browse files Browse the repository at this point in the history
  • Loading branch information
jtrouth committed Dec 20, 2023
1 parent 9ba1c4d commit a7fe6c0
Showing 1 changed file with 7 additions and 10 deletions.
17 changes: 7 additions & 10 deletions .github/workflows/build-and-push.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@ name: 'Build and push container image'
on:
push:
branches:
- 'master'
- 'k8s'
- '*'

jobs:
build-and-push:
Expand All @@ -27,11 +26,11 @@ jobs:

# gcloud CLI setup
- name: Login to GCP
uses: google-github-actions/setup-gcloud@v0
uses: 'google-github-actions/auth@v2'
with:
service_account_key: ${{ secrets.DEV_SA_KEY }}
project_id: ${{ secrets.SV_PROJ_NAME }}
export_default_credentials: true
credentials_json: ${{ secrets.DEV_SA_KEY }}
- name: 'Set up Cloud SDK'
uses: 'google-github-actions/setup-gcloud@v2'

# Configure Docker to use the gcloud command-line tool as a credential helper for authentication
- run: gcloud --quiet auth configure-docker us-central1-docker.pkg.dev
Expand All @@ -43,9 +42,7 @@ jobs:
images: |
us-central1-docker.pkg.dev/skyviewer/public-images/craft-base-image
flavor: |
latest=true
prefix=
suffix=
latest=${{ github.ref == 'master'}}
tags: |
type=ref,event=branch
type=ref,event=pr
Expand All @@ -55,7 +52,7 @@ jobs:
uses: docker/build-push-action@v2
with:
context: .
platforms: linux/amd64
platforms: linux/amd64,linux/arm64
push: ${{ github.event_name != 'pull_request' }}
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}

0 comments on commit a7fe6c0

Please sign in to comment.