chore: docker build fix (#583)

ipvm-wg · Feb 21, 2024 · 38b99be · 38b99be
1 parent 3c7c56a
commit 38b99be
Showing 1 changed file with 11 additions and 8 deletions.
diff --git a/.github/workflows/builds.yml b/.github/workflows/builds.yml
@@ -320,14 +320,18 @@ jobs:
           sudo rm -rf /usr/share/dotnet
 
       - name: Install cargo-get
-        if: (github.event_name == 'workflow_dispatch' && github.event.inputs.force-builds)
         run: cargo install cargo-get
 
       - name: Set Current Version
         if: (github.event_name == 'workflow_dispatch' && github.event.inputs.force-builds)
-        id: crate-version
+        id: crate-version-dispatch
         run: echo version=$(cargo get workspace.package.version)-rc.$(date +%s) >> $GITHUB_OUTPUT
 
+      - name: Set Current Version
+        if: github.event_name != 'workflow_dispatch'
+        id: crate-version
+        run: echo version=$(cargo get workspace.package.version) >> $GITHUB_OUTPUT
+
       - name: Set Env
         run: |
           echo "GIT_SHA=$(git rev-parse --short HEAD)" >> $GITHUB_ENV
@@ -347,20 +351,19 @@ jobs:
         uses: docker/setup-buildx-action@v3
 
       - name: Metadata
-        if: github.event_name != 'workflow_dispatch'
-        id: meta-release
+        if: (github.event_name == 'workflow_dispatch' && github.event.inputs.force-builds)
+        id: meta-dispatch
         uses: docker/metadata-action@v5
         with:
           images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
           tags: |
-            type=semver,pattern={{version}}
-            type=semver,pattern={{major}}.{{minor}}
+            type=semver,pattern={{version}},value=${{ steps.crate-version-dispatch.outputs.version }}
             type=raw,value=latest
             type=sha
 
       - name: Metadata
-        if: (github.event_name == 'workflow_dispatch' && github.event.inputs.force-builds)
-        id: meta-dispatch
+        if: github.event_name != 'workflow_dispatch'
+        id: meta-release
         uses: docker/metadata-action@v5
         with:
           images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}