Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
jpwhite3 committed Dec 14, 2023
2 parents 32d7fc7 + d22bc7f commit e7b4b01
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/docker-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Docker

on:
push:
branches: [ develop, main ]
branches: [develop, main]
tags:
- v*
pull_request:
Expand All @@ -15,7 +15,7 @@ jobs:
if: github.ref_name == 'develop'
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Run tests
run: |
make build
Expand All @@ -24,7 +24,7 @@ jobs:
if: github.ref_name == 'main'
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3

- name: Build image
run: docker build . --file Dockerfile --tag $IMAGE_NAME
Expand Down Expand Up @@ -52,4 +52,4 @@ jobs:
echo VERSION=$VERSION
docker tag $IMAGE_NAME $IMAGE_ID:$VERSION
docker push $IMAGE_ID:$VERSION
docker push $IMAGE_ID:$VERSION

0 comments on commit e7b4b01

Please sign in to comment.