From 0a3fec8df52c9f369e96e3630a957b4284a58e4c Mon Sep 17 00:00:00 2001
From: Henry Mercer <henrymercer@github.com>
Date: Wed, 5 Apr 2023 19:25:08 +0100
Subject: [PATCH] Improve environment variables in unset environment PR check

---
 .github/workflows/__unset-environment.yml | 38 ++++++++++++-----------
 pr-checks/checks/unset-environment.yml    | 37 +++++++++++-----------
 2 files changed, 39 insertions(+), 36 deletions(-)

diff --git a/.github/workflows/__unset-environment.yml b/.github/workflows/__unset-environment.yml
index 146e29685e..fe5a137fcf 100644
--- a/.github/workflows/__unset-environment.yml
+++ b/.github/workflows/__unset-environment.yml
@@ -76,41 +76,43 @@ jobs:
       with:
         upload-database: false
     - shell: bash
+      env:
+        CPP_DB: ${{ fromJson(steps.analysis.outputs.db-locations).cpp }}
+        CSHARP_DB: ${{ fromJson(steps.analysis.outputs.db-locations).csharp }}
+        GO_DB: ${{ fromJson(steps.analysis.outputs.db-locations).go }}
+        JAVA_DB: ${{ fromJson(steps.analysis.outputs.db-locations).java }}
+        JAVASCRIPT_DB: ${{ fromJson(steps.analysis.outputs.db-locations).javascript
+          }}
+        PYTHON_DB: ${{ fromJson(steps.analysis.outputs.db-locations).python }}
       run: |
-        CPP_DB="${{ fromJson(steps.analysis.outputs.db-locations).cpp }}"
-        if [[ ! -d "$CPP_DB" ]] || [[ ! "$CPP_DB" == "${RUNNER_TEMP}/customDbLocation/cpp" ]]; then
+        if [[ ! -d "$CPP_DB" ]] || [[ "$CPP_DB" != "$RUNNER_TEMP/customDbLocation/cpp" ]]; then
           echo "::error::Did not create a database for CPP, or created it in the wrong location." \
-            "Expected location was '${RUNNER_TEMP}/customDbLocation/cpp' but actual was '${CPP_DB}'"
+            "Expected location was '$RUNNER_TEMP/customDbLocation/cpp' but actual was '${CPP_DB}'"
           exit 1
         fi
-        CSHARP_DB="${{ fromJson(steps.analysis.outputs.db-locations).csharp }}"
-        if [[ ! -d "$CSHARP_DB" ]] || [[ ! "$CSHARP_DB" == "${RUNNER_TEMP}/customDbLocation/csharp" ]]; then
+        if [[ ! -d "$CSHARP_DB" ]] || [[ "$CSHARP_DB" != "$RUNNER_TEMP/customDbLocation/csharp" ]]; then
           echo "::error::Did not create a database for C Sharp, or created it in the wrong location." \
-            "Expected location was '${RUNNER_TEMP}/customDbLocation/csharp' but actual was '${CSHARP_DB}'"
+            "Expected location was '$RUNNER_TEMP/customDbLocation/csharp' but actual was '${CSHARP_DB}'"
           exit 1
         fi
-        GO_DB="${{ fromJson(steps.analysis.outputs.db-locations).go }}"
-        if [[ ! -d "$GO_DB" ]] || [[ ! "$GO_DB" == "${RUNNER_TEMP}/customDbLocation/go" ]]; then
+        if [[ ! -d "$GO_DB" ]] || [[ "$GO_DB" != "$RUNNER_TEMP/customDbLocation/go" ]]; then
           echo "::error::Did not create a database for Go, or created it in the wrong location." \
-            "Expected location was '${RUNNER_TEMP}/customDbLocation/go' but actual was '${GO_DB}'"
+            "Expected location was '$RUNNER_TEMP/customDbLocation/go' but actual was '${GO_DB}'"
           exit 1
         fi
-        JAVA_DB="${{ fromJson(steps.analysis.outputs.db-locations).java }}"
-        if [[ ! -d "$JAVA_DB" ]] || [[ ! "$JAVA_DB" == "${RUNNER_TEMP}/customDbLocation/java" ]]; then
+        if [[ ! -d "$JAVA_DB" ]] || [[ "$JAVA_DB" != "$RUNNER_TEMP/customDbLocation/java" ]]; then
           echo "::error::Did not create a database for Java, or created it in the wrong location." \
-            "Expected location was '${RUNNER_TEMP}/customDbLocation/java' but actual was '${JAVA_DB}'"
+            "Expected location was '$RUNNER_TEMP/customDbLocation/java' but actual was '${JAVA_DB}'"
           exit 1
         fi
-        JAVASCRIPT_DB="${{ fromJson(steps.analysis.outputs.db-locations).javascript }}"
-        if [[ ! -d "$JAVASCRIPT_DB" ]] || [[ ! "$JAVASCRIPT_DB" == "${RUNNER_TEMP}/customDbLocation/javascript" ]]; then
+        if [[ ! -d "$JAVASCRIPT_DB" ]] || [[ "$JAVASCRIPT_DB" != "$RUNNER_TEMP/customDbLocation/javascript" ]]; then
           echo "::error::Did not create a database for Javascript, or created it in the wrong location." \
-            "Expected location was '${RUNNER_TEMP}/customDbLocation/javascript' but actual was '${JAVASCRIPT_DB}'"
+            "Expected location was '$RUNNER_TEMP/customDbLocation/javascript' but actual was '${JAVASCRIPT_DB}'"
           exit 1
         fi
-        PYTHON_DB="${{ fromJson(steps.analysis.outputs.db-locations).python }}"
-        if [[ ! -d "$PYTHON_DB" ]] || [[ ! "$PYTHON_DB" == "${RUNNER_TEMP}/customDbLocation/python" ]]; then
+        if [[ ! -d "$PYTHON_DB" ]] || [[ "$PYTHON_DB" != "$RUNNER_TEMP/customDbLocation/python" ]]; then
           echo "::error::Did not create a database for Python, or created it in the wrong location." \
-            "Expected location was '${RUNNER_TEMP}/customDbLocation/python' but actual was '${PYTHON_DB}'"
+            "Expected location was '$RUNNER_TEMP/customDbLocation/python' but actual was '${PYTHON_DB}'"
           exit 1
         fi
     env:
diff --git a/pr-checks/checks/unset-environment.yml b/pr-checks/checks/unset-environment.yml
index 965afcfd2e..5489bc8aea 100644
--- a/pr-checks/checks/unset-environment.yml
+++ b/pr-checks/checks/unset-environment.yml
@@ -16,40 +16,41 @@ steps:
     with:
       upload-database: false
   - shell: bash
+    env:
+      CPP_DB: ${{ fromJson(steps.analysis.outputs.db-locations).cpp }}
+      CSHARP_DB: ${{ fromJson(steps.analysis.outputs.db-locations).csharp }}
+      GO_DB: ${{ fromJson(steps.analysis.outputs.db-locations).go }}
+      JAVA_DB: ${{ fromJson(steps.analysis.outputs.db-locations).java }}
+      JAVASCRIPT_DB: ${{ fromJson(steps.analysis.outputs.db-locations).javascript }}
+      PYTHON_DB: ${{ fromJson(steps.analysis.outputs.db-locations).python }}
     run: |
-      CPP_DB="${{ fromJson(steps.analysis.outputs.db-locations).cpp }}"
-      if [[ ! -d "$CPP_DB" ]] || [[ ! "$CPP_DB" == "${RUNNER_TEMP}/customDbLocation/cpp" ]]; then
+      if [[ ! -d "$CPP_DB" ]] || [[ "$CPP_DB" != "$RUNNER_TEMP/customDbLocation/cpp" ]]; then
         echo "::error::Did not create a database for CPP, or created it in the wrong location." \
-          "Expected location was '${RUNNER_TEMP}/customDbLocation/cpp' but actual was '${CPP_DB}'"
+          "Expected location was '$RUNNER_TEMP/customDbLocation/cpp' but actual was '${CPP_DB}'"
         exit 1
       fi
-      CSHARP_DB="${{ fromJson(steps.analysis.outputs.db-locations).csharp }}"
-      if [[ ! -d "$CSHARP_DB" ]] || [[ ! "$CSHARP_DB" == "${RUNNER_TEMP}/customDbLocation/csharp" ]]; then
+      if [[ ! -d "$CSHARP_DB" ]] || [[ "$CSHARP_DB" != "$RUNNER_TEMP/customDbLocation/csharp" ]]; then
         echo "::error::Did not create a database for C Sharp, or created it in the wrong location." \
-          "Expected location was '${RUNNER_TEMP}/customDbLocation/csharp' but actual was '${CSHARP_DB}'"
+          "Expected location was '$RUNNER_TEMP/customDbLocation/csharp' but actual was '${CSHARP_DB}'"
         exit 1
       fi
-      GO_DB="${{ fromJson(steps.analysis.outputs.db-locations).go }}"
-      if [[ ! -d "$GO_DB" ]] || [[ ! "$GO_DB" == "${RUNNER_TEMP}/customDbLocation/go" ]]; then
+      if [[ ! -d "$GO_DB" ]] || [[ "$GO_DB" != "$RUNNER_TEMP/customDbLocation/go" ]]; then
         echo "::error::Did not create a database for Go, or created it in the wrong location." \
-          "Expected location was '${RUNNER_TEMP}/customDbLocation/go' but actual was '${GO_DB}'"
+          "Expected location was '$RUNNER_TEMP/customDbLocation/go' but actual was '${GO_DB}'"
         exit 1
       fi
-      JAVA_DB="${{ fromJson(steps.analysis.outputs.db-locations).java }}"
-      if [[ ! -d "$JAVA_DB" ]] || [[ ! "$JAVA_DB" == "${RUNNER_TEMP}/customDbLocation/java" ]]; then
+      if [[ ! -d "$JAVA_DB" ]] || [[ "$JAVA_DB" != "$RUNNER_TEMP/customDbLocation/java" ]]; then
         echo "::error::Did not create a database for Java, or created it in the wrong location." \
-          "Expected location was '${RUNNER_TEMP}/customDbLocation/java' but actual was '${JAVA_DB}'"
+          "Expected location was '$RUNNER_TEMP/customDbLocation/java' but actual was '${JAVA_DB}'"
         exit 1
       fi
-      JAVASCRIPT_DB="${{ fromJson(steps.analysis.outputs.db-locations).javascript }}"
-      if [[ ! -d "$JAVASCRIPT_DB" ]] || [[ ! "$JAVASCRIPT_DB" == "${RUNNER_TEMP}/customDbLocation/javascript" ]]; then
+      if [[ ! -d "$JAVASCRIPT_DB" ]] || [[ "$JAVASCRIPT_DB" != "$RUNNER_TEMP/customDbLocation/javascript" ]]; then
         echo "::error::Did not create a database for Javascript, or created it in the wrong location." \
-          "Expected location was '${RUNNER_TEMP}/customDbLocation/javascript' but actual was '${JAVASCRIPT_DB}'"
+          "Expected location was '$RUNNER_TEMP/customDbLocation/javascript' but actual was '${JAVASCRIPT_DB}'"
         exit 1
       fi
-      PYTHON_DB="${{ fromJson(steps.analysis.outputs.db-locations).python }}"
-      if [[ ! -d "$PYTHON_DB" ]] || [[ ! "$PYTHON_DB" == "${RUNNER_TEMP}/customDbLocation/python" ]]; then
+      if [[ ! -d "$PYTHON_DB" ]] || [[ "$PYTHON_DB" != "$RUNNER_TEMP/customDbLocation/python" ]]; then
         echo "::error::Did not create a database for Python, or created it in the wrong location." \
-          "Expected location was '${RUNNER_TEMP}/customDbLocation/python' but actual was '${PYTHON_DB}'"
+          "Expected location was '$RUNNER_TEMP/customDbLocation/python' but actual was '${PYTHON_DB}'"
         exit 1
       fi