From 47aecbca538d1109b37853eb4912cfe80b7804df Mon Sep 17 00:00:00 2001
From: Harsh Shandilya <me@msfjarvis.dev>
Date: Sun, 6 Mar 2022 00:01:05 +0530
Subject: Follow-up fixes to snapshot deployment (#1768)

* scripts/deploy-snapshot: ensure GITHUB_WORKSPACE is set when script is run

* scripts/deploy-snapshot: prevent command output from breaking comparison

* scripts/deploy-snapshot: fix shellcheck nits

* gitignore: add outputs directory

* github: pass privileged token to deployment script
---
 scripts/deploy-snapshot.sh | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'scripts')

diff --git a/scripts/deploy-snapshot.sh b/scripts/deploy-snapshot.sh
index 5a8c846f..760e52ef 100755
--- a/scripts/deploy-snapshot.sh
+++ b/scripts/deploy-snapshot.sh
@@ -8,7 +8,7 @@ set -ex
 
 LATEST_TAG="latest"
 CURRENT_REV="$(git rev-parse --short HEAD)"
-ASSET_DIRECTORY="${GITHUB_WORKSPACE}/app/outputs"
+ASSET_DIRECTORY="${GITHUB_WORKSPACE:?}/app/outputs"
 
 function overwrite_local_tag() {
   git tag -f "${LATEST_TAG}"
@@ -19,7 +19,7 @@ function overwrite_remote_tag() {
 }
 
 function has_release() {
-  gh release view "${LATEST_TAG}"
+  gh release view "${LATEST_TAG}" &>/dev/null
   echo "$?"
 }
 
@@ -28,18 +28,18 @@ function delete_release() {
 }
 
 function create_rev_file() {
-  pushd "${ASSET_DIRECTORY}"
+  pushd "${ASSET_DIRECTORY}" || return
   echo "${CURRENT_REV}" | tee rev-hash.txt
-  popd
+  popd || return
 }
 
 function create_release() {
   local CHANGELOG_FILE
   CHANGELOG_FILE="$(mktemp)"
   echo "Latest release for APS from revision ${CURRENT_REV}" | tee "${CHANGELOG_FILE}"
-  pushd "${ASSET_DIRECTORY}"
+  pushd "${ASSET_DIRECTORY}" || return
   gh release create --title "Latest snapshot build" -F "${CHANGELOG_FILE}" "${LATEST_TAG}" ./*
-  popd
+  popd || return
 }
 
 overwrite_local_tag
-- 
cgit v1.2.3