Merge pull request #1 from falmar/dev

pr workflow
falmar · Apr 29, 2023 · 47c1cab · 47c1cab
2 parents 4595e1b + f3848f4
commit 47c1cab
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 20 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -1,8 +1,11 @@
 name: build
+
 on:
-  push:
+  workflow_call:
+  pull_request:
     branches:
       - master
+      - dev
 
 jobs:
   build:
@@ -33,12 +36,3 @@ jobs:
           CGO_ENABLED: "0"
           GOOS: linux
           GOARCH: ${{ matrix.platform }}
-
-  push:
-    if: ${{ success() }}
-    needs: build
-    uses: ./.github/workflows/push.yaml
-    with:
-      image_tag: "latest"
-    secrets:
-      HUB_PASSWORD: ${{ secrets.HUB_PASSWORD }}
diff --git a/.github/workflows/push.yaml b/.github/workflows/push.yaml
@@ -1,16 +1,9 @@
 name: push_image
 
 on:
-  workflow_call:
-    inputs:
-      image_tag:
-        type: string
-        description: 'The tag of the image to push'
-        required: true
-        default: 'latest'
-    secrets:
-      HUB_PASSWORD:
-        required: true
+  push:
+    branches:
+      - master
 
 env:
   REGISTRY: docker.io
@@ -19,7 +12,12 @@ env:
   DOCKER_IMAGE_TAG: ${{ inputs.image_tag }}
 
 jobs:
+  build:
+    uses: ./.github/workflows/build.yaml
+
   image:
+    if: ${{ success() }}
+    needs: build
     env:
       platform: linux/amd64,linux/arm64
     runs-on: ubuntu-latest