Fix missing variables in deploy workflow

.github/workflows/deploy.yml

@@ -10,7 +10,7 @@ jobs:
 
     env:
       GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
-      GITHUB_COMMIT: ${{ github.sha }}
+      GITHUB_TAG: ${{ github.event.release.tag_name }}
       GITHUB_REPO_SLUG: ${{ github.repository }}
       GITHUB_BUILD_NUMBER: ${{ github.run_number }}
       DEPLOY_WEBHOOK_URL: ${{ secrets.DEPLOY_WEBHOOK_URL }}

scripts/deploy-manually.sh

@@ -35,8 +35,8 @@ posix_read "Tag" GITHUB_TAG
 posix_read "Repo slug (e.g. hikari-py/hikari)" GITHUB_REPO_SLUG
 
 git checkout "${GITHUB_TAG}"
-GITHUB_COMMIT=$(git rev-parse HEAD)
-echo "Detected GITHUB_COMMIT to be ${GITHUB_COMMIT}"
+GITHUB_SHA=$(git rev-parse HEAD)
+echo "Detected GITHUB_SHA to be ${GITHUB_SHA}"
 
 set -x
 rm public -Rf || true

scripts/deploy.sh

@@ -20,21 +20,13 @@
 # SOFTWARE.
 set -e
 
-VERSION=${GITHUB_TAG}
-REF=${GITHUB_COMMIT}
-
-echo "===== INSTALLING DEPENDENCIES ====="
-python -m pip install \
-    setuptools \
-    wheel \
-    nox \
-    twine \
-    requests \
-    -r requirements.txt
-
 echo "Defined environment variables"
 env | grep -oP "^[^=]+" | sort
 
+if [ -z ${GITHUB_TAG+x} ]; then echo '$GITHUB_TAG environment variable is missing' && exit 1; fi
+if [ -z "${GITHUB_TAG}" ]; then echo '$GITHUB_TAG environment variable is empty' && exit 1; fi
+if [ -z ${GITHUB_SHA+x} ]; then echo '$GITHUB_SHA environment variable is missing' && exit 1; fi
+if [ -z "${GITHUB_SHA}" ]; then echo '$GITHUB_SHA environment variable is empty' && exit 1; fi
 if [ -z ${GITHUB_TOKEN+x} ]; then echo '$GITHUB_TOKEN environment variable is missing' && exit 1; fi
 if [ -z "${GITHUB_TOKEN}" ]; then echo '$GITHUB_TOKEN environment variable is empty' && exit 1; fi
 if [ -z ${DEPLOY_WEBHOOK_URL+x} ]; then echo '$DEPLOY_WEBHOOK_URL environment variable is missing' && exit 1; fi
@@ -44,6 +36,18 @@ if [ -z "${TWINE_USERNAME}" ]; then echo '$TWINE_USERNAME environment variable i
 if [ -z ${TWINE_PASSWORD+x} ]; then echo '$TWINE_PASSWORD environment variable is missing' && exit 1; fi
 if [ -z "${TWINE_PASSWORD}" ]; then echo '$TWINE_PASSWORD environment variable is empty' && exit 1; fi
 
+VERSION=${GITHUB_TAG}
+REF=${GITHUB_SHA}
+
+echo "===== INSTALLING DEPENDENCIES ====="
+python -m pip install \
+    setuptools \
+    wheel \
+    nox \
+    twine \
+    requests \
+    -r requirements.txt
+
 echo "-- Bumping repository version to ${VERSION} (ref: ${REF}) --"
 sed "s|^__version__.*|__version__ = \"${VERSION}\"|g" -i hikari/_about.py
 sed "s|^__git_sha1__.*|__git_sha1__ = \"${REF}\"|g" -i hikari/_about.py

scripts/deploy_webhook.py

@@ -26,7 +26,7 @@
     webhook_url = os.environ["DEPLOY_WEBHOOK_URL"]
     tag = os.environ["GITHUB_TAG"]
     build_no = os.environ["GITHUB_BUILD_NUMBER"]
-    commit_sha = os.environ["GITHUB_COMMIT"]
+    commit_sha = os.environ["GITHUB_SHA"]
 
     payload = dict(
         username="Github Actions",