Use inputs again and added conditional

khaneliman · Nov 12, 2021 · 2fe3296 · 2fe3296
1 parent 9a5d502
commit 2fe3296
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 3 deletions.
diff --git a/.github/workflows/docker-webapi.yml b/.github/workflows/docker-webapi.yml
@@ -9,6 +9,11 @@ on:
   release:
     types: [published]
   workflow_dispatch:
+    inputs:
+      branch:
+        description: 'Branch or commit to build'
+        required: true
+        default: 'develop'
 
 env:
   REGISTRY: ghcr.io
@@ -23,10 +28,16 @@ jobs:
       packages: write
     if: ${{ github.event.workflow_run.conclusion == 'success' || github.event_name == 'release' || github.event_name == 'workflow_dispatch' }}
     steps:
+      - uses: haya14busa/action-cond@v1
+        id: condval
+        with:
+          cond: ${{ github.event_name == 'workflow_dispatch' }}
+          if_true: "${{ github.event.inputs.branch }}"
+          if_false: " ${{ github.ref_name }}"
       - name: Checkout repository
         uses: actions/checkout@v2
         with:
-          ref: ${{ github.event.workflow_run.head_branch }}
+          ref: ${{ steps.condval.outputs.value }}
 
       # Login against a Docker registry except on PR
       # https://github.com/docker/login-action

diff --git a/.github/workflows/docker-webapp.yml b/.github/workflows/docker-webapp.yml
@@ -9,6 +9,11 @@ on:
   release:
     types: [published]
   workflow_dispatch:
+    inputs:
+      branch:
+        description: 'Branch or commit to build'
+        required: true
+        default: 'develop'
 
 env:
   REGISTRY: ghcr.io
@@ -23,11 +28,16 @@ jobs:
       packages: write
     if: ${{ github.event.workflow_run.conclusion == 'success' || github.event_name == 'release' || github.event_name == 'workflow_dispatch' }}
     steps:
+      - uses: haya14busa/action-cond@v1
+        id: condval
+        with:
+          cond: ${{ github.event_name == 'workflow_dispatch' }}
+          if_true: "${{ github.event.inputs.branch }}"
+          if_false: " ${{ github.ref_name }}"
       - name: Checkout repository
         uses: actions/checkout@v2
         with:
-          ref: ${{ github.event.workflow_run.head_branch }}
-
+          ref: ${{ steps.condval.outputs.value }}
       # Login against a Docker registry except on PR
       # https://github.com/docker/login-action
       - name: Log into registry ${{ env.REGISTRY }}