testit

platform9 · Sep 18, 2024 · 2efec14 · 2efec14
1 parent b2cfcc5
commit 2efec14
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 9 deletions.
diff --git a/.github/workflows/hostplumber-multiarch-build-and-push.yml b/.github/workflows/hostplumber-multiarch-build-and-push.yml
@@ -26,11 +26,12 @@ jobs:
         run: echo ${{ github.run_number }}
 
       - name: Set env
-        run:
-          if startsWith(${{ env.BRANCH }}, 'v*')
-             echo "TAG=$(echo "${{ env.BRANCH }}") >> $GITHUB_ENV
+        run: |
+          echo "TAG=$(echo "${{ env.BRANCH }}" | tr -d /)" >> $GITHUB_ENV 
+          if startsWith(${{ env.TAG }}, 'v*')
+             echo "TAG=$(echo "${{ env.TAG }}")  >> $GITHUB_ENV
           else
-             echo "TAG=$(echo "${{ env.BRANCH }}" | tr -d /)"-${{ github.run_number }} >> $GITHUB_ENV
+             echo "TAG=$(echo "${{ env.BRANCH }}")-${{ github.run_number }}  >> $GITHUB_ENV
           fi
 
       - uses: actions/checkout@v3

diff --git a/get-label.bash b/get-label.bash
@@ -1,18 +1,18 @@
 #!/bin/bash
 #First set the suffix to some value, either Teamcity build-id or <abbrev-sha1>
-if [[ -z "${TEAMCITY_BUILD_ID}" ]]; then
+if [[ -z "${{ github.run_number }}" ]]; then
     SUFFIX=$(git rev-parse --short HEAD)
 else
-    SUFFIX=${TEAMCITY_BUILD_ID}
+    SUFFIX=${{ github.run_number }}
 fi
 
 # Get the tag as the version
 TAG=$(git describe --tags HEAD)
 if [[ $? -ne 0 ]]
 then
     # if we cannot get the tag, lets use the <branch>-pmk-<suffix> as the tag name
-    TAG=$(git rev-parse --abbrev-ref HEAD | sed 's/[^a-zA-Z0-9_.]/-/g')-pmk-${SUFFIX}
+    echo "TAG=$(git rev-parse --abbrev-ref HEAD | sed 's/[^a-zA-Z0-9_.]/-/g')-pmk-${SUFFIX}" >> $GITHUB_ENV
 else
-    TAG=$(echo $TAG | sed 's/-.*//')-pmk-${SUFFIX}
+    echo "TAG=$(echo $TAG | sed 's/-.*//')-pmk-${SUFFIX}" >> $GITHUB_ENV
 fi
-echo $TAG
+echo ${{ env.TAG }}