Improve environment variables in unset environment PR check

github · Apr 5, 2023 · 0a3fec8 · 0a3fec8
1 parent 322cea6
commit 0a3fec8
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 36 deletions.
diff --git a/.github/workflows/__unset-environment.yml b/.github/workflows/__unset-environment.yml
diff --git 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