fix(docker): fix release names not flowing through

flxbl-io · Oct 28, 2023 · ba47dcf · ba47dcf
1 parent 6320994
commit ba47dcf
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/.github/workflows/sfpowerscripts-copy-docker.yml b/.github/workflows/sfpowerscripts-copy-docker.yml
@@ -54,7 +54,10 @@ jobs:
     - name: 'Get package version'
       run: |
          echo "PKG_VERSION=$(jq -r ".version" packages/sfpowerscripts-cli/package.json)" >> $GITHUB_ENV
-         echo "RELEASE_VERSION=$(jq -r ".release" packages/sfpowerscripts-cli/package.json| read input; echo "$(cut -c1-3 <<< "$input")-$(cut -d' ' -f2 <<< "$input")" | tr '[:upper:]' '[:lower:]')" >> $GITHUB_ENV
+         RELEASE_NAME=$(jq -r ".release" packages/sfpowerscripts-cli/package.json)
+         RELEASE_NAME_AS_ARRAY=($RELEASE_NAME)
+         RELEASE_NAME=$(echo ${RELEASE_NAME_AS_ARRAY[0]} | cut -c1-3)${RELEASE_NAME_AS_ARRAY[1]}
+         echo "RELEASE_NAME=release-$RELEASE_NAME"  >> $GITHUB_ENV
 
     - name: 'Re expose secretes'
       run: |

diff --git a/.github/workflows/sfpowerscripts-promote-docker.yml b/.github/workflows/sfpowerscripts-promote-docker.yml
@@ -38,7 +38,10 @@ jobs:
     - name: 'Get package version'
       run: |
          echo "PKG_VERSION=$(jq -r ".version" packages/sfpowerscripts-cli/package.json)" >> $GITHUB_ENV
-         echo "RELEASE_VERSION=$(jq -r ".release" packages/sfpowerscripts-cli/package.json| read input; echo "$(cut -c1-3 <<< "$input")-$(cut -d' ' -f2 <<< "$input")" | tr '[:upper:]' '[:lower:]')" >> $GITHUB_ENV
+         RELEASE_NAME=$(jq -r ".release" packages/sfpowerscripts-cli/package.json)
+         RELEASE_NAME_AS_ARRAY=($RELEASE_NAME)
+         RELEASE_NAME=$(echo ${RELEASE_NAME_AS_ARRAY[0]} | cut -c1-3)${RELEASE_NAME_AS_ARRAY[1]}
+         echo "RELEASE_NAME=release-$RELEASE_NAME"  >> $GITHUB_ENV
          
 
     - name: 'Re expose secrets'