fix: use package version in prod hook

safe-global · Mar 9, 2022 · 9b0fa3e · 9b0fa3e
1 parent 571033b
commit 9b0fa3e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/scripts/deploy_to_s3_bucket.sh b/scripts/deploy_to_s3_bucket.sh
@@ -3,11 +3,7 @@
 function deploy_app {
   BUNDLE_FOLDER="build"
 
-  PACKAGE_VERSION=$(cat package.json \
-  | grep version \
-  | head -1 \
-  | awk -F: '{ print $2 }' \
-  | sed 's/[",]//g')
+  PACKAGE_VERSION=$(sed -nr 's/^\s*\"version": "([0-9]{1,}\.[0-9]{1,}.*)",$/\1/p' package.json)
 
   if [ -n "$APPEND_TAG" ]
   then

diff --git a/scripts/prepare_production_deployment.sh b/scripts/prepare_production_deployment.sh
@@ -7,10 +7,12 @@ set -ev
 if [ -n "$PROD_DEPLOYMENT_HOOK_TOKEN" ] && [ -n "$PROD_DEPLOYMENT_HOOK_URL" ]
 then
   APP_NAME="$(basename $(pwd))"
+  PACKAGE_VERSION=$(sed -nr 's/^\s*\"version": "([0-9]{1,}\.[0-9]{1,}.*)",$/\1/p' package.json)
   curl --silent --output /dev/null --write-out "%{http_code}" -X POST \
      -F token="$PROD_DEPLOYMENT_HOOK_TOKEN" \
      -F ref=master \
      -F "variables[TRIGGER_RELEASE_APP_NAME]=$APP_NAME" \
+     -F "variables[TRIGGER_RELEASE_COMMIT_TAG]=$PACKAGE_VERSION" \
       $PROD_DEPLOYMENT_HOOK_URL
 else
   echo "[ERROR] Production deployment could not be prepared"