use sha in case it's not tag

threefoldtech · Oct 17, 2023 · 573cef9 · 573cef9
1 parent ef6e0fc
commit 573cef9
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/.github/workflows/bin-package-18.04.yaml b/.github/workflows/bin-package-18.04.yaml
@@ -24,7 +24,7 @@ jobs:
           if [ "${{ github.ref_type }}" = "tag" ]; then
             echo "reference=${ref#refs/tags/}" >> $GITHUB_OUTPUT
           else
-            echo "reference=${ref}" >> $GITHUB_OUTPUT
+            echo "reference=${{ github.sha }}" >> $GITHUB_OUTPUT
           fi
       - name: Setup basesystem
         run: |

diff --git a/.github/workflows/bin-package.yaml b/.github/workflows/bin-package.yaml
@@ -24,7 +24,7 @@ jobs:
           if [ "${{ github.ref_type }}" = "tag" ]; then
             echo "reference=${ref#refs/tags/}" >> $GITHUB_OUTPUT
           else
-            echo "reference=${ref}" >> $GITHUB_OUTPUT
+            echo "reference=${{ github.sha }}" >> $GITHUB_OUTPUT
           fi
       - name: Setup basesystem
         run: |
@@ -44,9 +44,9 @@ jobs:
           user: tf-autobuilder
           root: bins/releases/${{ inputs.package }}
           name: ${{ steps.package.outputs.name }}.flist
-      - name: Publishing
+      - name: Tagging
         uses: threefoldtech/publish-flist@master
-        if: success() && github.ref == 'refs/heads/main'
+        if: success()
         with:
           token: ${{ secrets.HUB_JWT }}
           action: tag

diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml
@@ -35,7 +35,7 @@ jobs:
           if [ "${{ github.ref_type }}" = "tag" ]; then
             echo "reference=${ref#refs/tags/}" >> $GITHUB_OUTPUT
           else
-            echo "reference=${ref}" >> $GITHUB_OUTPUT
+            echo "reference=${{ github.sha }}" >> $GITHUB_OUTPUT
           fi
 
       - name: Collecting files