consolidate builds

ljmerza · Jan 15, 2024 · f243732 · f243732
1 parent 23f5ceb
commit f243732
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 7 deletions.
diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml
@@ -3,8 +3,8 @@ name: Deploy to Docker Hub
 on:
   workflow_dispatch:
   push:
-    tags:
-      - '*'
+    branches:
+      - master
 
 jobs:
   test:

diff --git a/.github/workflows/tag.yaml b/.github/workflows/tag.yaml
@@ -27,7 +27,7 @@ jobs:
       run: python test.py
 
 
-  docker:
+  release:
     needs: test
     runs-on: ubuntu-latest
     permissions:
@@ -46,4 +46,26 @@ jobs:
           tag_name: ${{ steps.tag_name.outputs.tag }}
           release_name: Release ${{ steps.tag_name.outputs.tag }}
           draft: false
-          prerelease: false
+          prerelease: false
+
+  docker_tag:
+    needs: test
+    runs-on: ubuntu-latest
+    steps:
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Login to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - name: Build and push tag
+        uses: docker/build-push-action@v5
+        with:
+          push: true
+          tags: ${{ secrets.DOCKERHUB_USERNAME }}/${{ secrets.DOCKERHUB_REPO }}:${{ github.ref_name }}
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -3,9 +3,6 @@ name: Run Tests
 on:
   workflow_dispatch:
   pull_request:
-  push:
-    branches:
-      - master
 
 jobs:
   test:
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,8 +3,8 @@ name: Deploy to Docker Hub @@
     on:
       workflow_dispatch:
       push:
-        tags:
-          - '*'
+        branches:
+          - master
     jobs:
       test:
@@ Expand Down @@