fix: fix

jodevsa · May 13, 2023 · a069a6b · a069a6b
1 parent 7418851
commit a069a6b
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 10 deletions.
diff --git a/.github/workflows/build-images-workflow.yaml b/.github/workflows/build-images-workflow.yaml
@@ -7,6 +7,9 @@ env:
 on:
   workflow_call:
     inputs:
+      ref:
+        required: true
+        type: string
       new_images_tag:
         required: true
         type: string
@@ -34,6 +37,8 @@ jobs:
 
     steps:
 
+
+
     - name: Set up QEMU
       uses: docker/setup-qemu-action@v2
 

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -7,28 +7,31 @@ on:
 permissions: write-all
 
 jobs:
-  build-images:
+  generate-next-semantic-version:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
         name: Checkout repository
         with:
-          ref: main
           submodules: true
       - name: semantic-release extract new version
         id: extract
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
           npm install @semantic-release/commit-analyzer @semantic-release/release-notes-generator @semantic-release/changelog @semantic-release/git semantic-release/exec
-          echo "version=v$(npx semantic-release --dryRun | grep -oP 'Published release \K.*? ')" >> "$GITHUB_OUTPUT"
-          ls ./.github/workflows/build-images-workflow.yaml
-      - uses: ./.github/workflows/build-images-workflow.yaml
-        name: build images
-        with:
-          set_new_images_as_latest: false
-          push: true
-          new_images_tag: ${{ steps.extract.outputs.version }}
+          echo "version=v$(npx semantic-release --dryRun grep -oP 'Published release \K.*? ')" >> "$GITHUB_OUTPUT"
+    outputs:
+      version: ${{ steps.extract.outputs.version }}
+
+  build-images:
+    needs: [generate-next-semantic-version]
+    uses: ./.github/workflows/build-images-workflow.yaml
+    with:
+      set_new_images_as_latest: false
+      push: true
+      new_images_tag: ${{needs.generate-next-semantic-version.outputs.version}}
+      ref: main
 
   release:
     needs: [build-images]