Merge pull request #7 from dysnix/workflow-disptach

Use workflow dispatch for publish and build
dysnix · Aug 8, 2021 · 0e82116 · 0e82116
2 parents fc51dc3 + 185abd8
commit 0e82116
Show file tree

Hide file tree

Showing 3 changed files with 59 additions and 30 deletions.
diff --git a/.github/workflows/build-and-push.yaml b/.github/workflows/build-and-push.yaml
@@ -25,7 +25,7 @@ jobs:
       minor_version: ${{ steps.kubever.outputs.minorversion }}
       ## Note!: prerelease (-r\d+) is used as the release id
       release_id: ${{ steps.kubever.outputs.prerelease }}
-      push: ${{ steps.kubever.outputs.failed == 'false' }}
+      push: ${{ steps.kubever.outputs.failed != 'false' }}
     steps:
       -
         uses: actions/github-script@v4
@@ -94,8 +94,8 @@ jobs:
           ## !!!!NOTE: force-push of v1.2.3-r* tags with lower release id overwrites v1.2.3 image!
           tags: |
             type=semver,pattern=v{{version}},value=${{ needs.setup.outputs.version }}
-            type=semver,pattern=v{{version}},value=${{ needs.setup.outputs.version }},suffix=${{ matrix.suffix }}-${{ needs.setup.outputs.release_id }}
-            type=semver,pattern=v{{major}}.{{minor}},value=${{ needs.setup.outputs.version }},enable=${{ steps.findMinor.outputs.older == 'false' }}
+            type=semver,pattern=v{{version}},value=${{ needs.setup.outputs.version }},suffix=${{ matrix.suffix }}-${{ needs.setup.outputs.release_id }},enable=${{ needs.setup.outputs.release_id != '' }}
+            type=semver,pattern=v{{major}}.{{minor}},value=${{ needs.setup.outputs.version }},enable=${{ steps.latestMinor.outputs.older == 'false' }}
             type=raw,value=${{ steps.set.outputs.latestValue }},suffix=
       -
         name: Set up Docker Buildx
@@ -118,7 +118,7 @@ jobs:
         uses: docker/build-push-action@v2
         with:
           context: .
-          push: ${{ needs.pre.outputs.kubectlVersion != '' }}
+          push: ${{ needs.setup.outputs.push }}
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
           cache-from: type=local,src=/tmp/.buildx-cache

diff --git a/.github/workflows/dispatch-build.yaml b/.github/workflows/dispatch-build.yaml
@@ -0,0 +1,20 @@
+name: Dispatch Build
+on:
+  push:
+    tags:
+      - 'v[0-9]+.[0-9]+.[0-9]+'
+      - 'v[0-9]+.[0-9]+.[0-9]+-*'
+
+jobs:
+  deploy:
+    name: Build and Push Image
+    runs-on: ubuntu-latest
+    steps:
+      - uses: aurelien-baudet/workflow-dispatch@v2
+        with:
+          workflow: Build and Push Image
+          token: ${{ secrets.GH_DYSNIX_BOT_TOKEN }}
+          wait-for-completion-timeout: 10m
+          wait-for-completion-interval: 30s
+          inputs: |
+            {"version": "${{ github.ref }}"}
diff --git a/.github/workflows/publish-new-releases.yaml b/.github/workflows/publish-new-releases.yaml
@@ -2,7 +2,7 @@
 name: Publish new releases
 on:
   schedule:
-    - cron: '7 */6 * * *'
+    - cron: '*/10 * * * *'
 
 jobs:
   publish:
@@ -12,33 +12,42 @@ jobs:
     strategy:
       matrix:
         versionRegex:
-         - v1\.18\.[0-9]+$
          - v1\.19\.[0-9]+$
          - v1\.20\.[0-9]+$
          - v1\.21\.[0-9]+$
 
     steps:
-    - uses: actions/checkout@v2
-    -
-      uses: dysnix/find-latest-tag@v1
-      id: upstream
-      with:
-        regex: ${{ matrix.versionRegex }}
-        repository: kubernetes/kubernetes
-    -
-      uses: dysnix/find-latest-tag@v1
-      id: latest
-      with:
-        compared-to-tag: ${{ steps.upstream.outputs.tag }}
-        regex: ${{ matrix.versionRegex }}
-        repository: ${{ github.repository }}
-    -
-      name: Publish new release
-      uses: ncipollo/release-action@v1
-      if: steps.latest.outputs.newer == 'true' || steps.latest.outputs.tag == ''
-      with:
-        body: |
-          new upstream release ${{ steps.upstream.outputs.tag }}
-        token: ${{ secrets.GITHUB_TOKEN }}
-        tag: ${{ steps.upstream.outputs.tag }}
-        commit: master
+      - uses: actions/checkout@v2
+      -
+        uses: dysnix/find-latest-tag@v1
+        id: upstream
+        with:
+          regex: ${{ matrix.versionRegex }}
+          repository: kubernetes/kubernetes
+      -
+        uses: dysnix/find-latest-tag@v1
+        id: latest
+        with:
+          compared-to-tag: ${{ steps.upstream.outputs.tag }}
+          regex: ${{ matrix.versionRegex }}
+          repository: ${{ github.repository }}
+      -
+        if: steps.latest.outputs.newer == 'true' || steps.latest.outputs.tag == ''
+        uses: aurelien-baudet/workflow-dispatch@v2
+        with:
+          workflow: Build and Push Image
+          token: ${{ secrets.GH_DYSNIX_BOT_TOKEN }}
+          wait-for-completion-timeout: 10m
+          wait-for-completion-interval: 30s
+          inputs: |
+            {"version": "${{ steps.upstream.outputs.tag }}"}
+      -
+        name: Publish new release
+        uses: ncipollo/release-action@v1
+        if: steps.latest.outputs.newer == 'true' || steps.latest.outputs.tag == ''
+        with:
+          body: |
+            new upstream release ${{ steps.upstream.outputs.tag }}
+          token: ${{ secrets.GITHUB_TOKEN }}
+          tag: ${{ steps.upstream.outputs.tag }}
+          commit: master