Publishing - fix main branch name and push on tag (#249)

wpilibsuite · Jun 30, 2021 · 27bb84d · 27bb84d
1 parent 02ea948
commit 27bb84d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -56,7 +56,7 @@ jobs:
           version: v0.5.1
       - name: Login to DockerHub
         uses: docker/login-action@v1
-        if: ${{ github.repository_owner == 'wpilibsuite' && github.ref == 'refs/heads/master' }}
+        if: ${{ github.repository_owner == 'wpilibsuite' && (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/v')) }}
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
@@ -73,7 +73,7 @@ jobs:
       - name: Base - Build and push
         uses: docker/build-push-action@v2
         with:
-          push: ${{ github.repository_owner == 'wpilibsuite' && github.ref == 'refs/heads/master' }}
+          push: ${{ github.repository_owner == 'wpilibsuite' && (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/v')) }}
           context: .
           tags: ${{ steps.docker_meta.outputs.tags }}
           labels: ${{ steps.docker_meta.outputs.labels }}

diff --git a/.github/workflows/containers.yml b/.github/workflows/containers.yml
@@ -7,7 +7,7 @@ jobs:
     name: Build
     runs-on: ubuntu-latest
     env:
-      push: ${{ github.repository_owner == 'wpilibsuite' && github.ref == 'refs/heads/master' }}
+      push: ${{ github.repository_owner == 'wpilibsuite' && (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/v')) }}
     steps:
       - uses: actions/checkout@v2
       - uses: docker/setup-buildx-action@v1
@@ -17,7 +17,7 @@ jobs:
 
       - name: Login to DockerHub
         uses: docker/login-action@v1
-        if: ${{ github.repository_owner == 'wpilibsuite' && github.ref == 'refs/heads/master' }}
+        if: ${{ github.repository_owner == 'wpilibsuite' && (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/v')) }}
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}