tweak build

davidkarlsen · Sep 8, 2023 · 327d302 · 327d302
1 parent f5c717b
commit 327d302
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -24,9 +24,9 @@ jobs:
           fetch-depth: 0
       - name: createVersion
         run: |
-          echo "VERSION=$(git describe --tag --always)" >> $GITHUB_ENV
-          echo "CLEAN_VERSION=$(git describe --tag --always | sed s/^v//)" >> $GITHUB_ENV
-          echo "IMG=ghcr.io/${{ github.repository }}:${{ env.CLEAN_VERSION }}" >> $GITHUB_ENV
+          echo "GIT_VERSION=$(git describe --tag --always)" >> $GITHUB_ENV
+          echo "VERSION=$(git describe --tag --always | sed s/^v//)" >> $GITHUB_ENV
+          echo "IMG=ghcr.io/${{ github.repository }}:${{ env.VERSION }}" >> $GITHUB_ENV
 
       - name: golangci-lint
         uses: reviewdog/action-golangci-lint@v2
@@ -42,7 +42,11 @@ jobs:
 
       - name: build and push
         run: |
-          make docker-buildx bundle bundle-build bundle-push IMG=${{ env.IMG }}
+          make docker-buildx IMG=${{ env.IMG }}
+
+      - name: bundle
+        run: |
+          make bundle bundle-build bundle-push IMG=${{ env.IMG }}
 
       - name: catalog
         run: |