From 93ad0e7251d52654db7ab3a7f7e4b18dbc4b1dc8 Mon Sep 17 00:00:00 2001
From: Jay Lee <jay0lee@gmail.com>
Date: Tue, 25 Jul 2023 15:21:14 -0400
Subject: [PATCH] actions: declare some common env vars earlier

---
 .github/workflows/build.yml | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index d329f7e1..3e0dc96e 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -119,8 +119,17 @@ jobs:
           python-version: ${{ matrix.python }}
           allow-prereleases: true
 
-      - name: Set cURL and GAMCFGDIR variables
+      - name: common variables for all runs
+        env:
+          arch: ${{ matrix.arch }}
+          JID: ${{ matrix.jid }}
+          ACTIONS_CACHE: ${{ steps.cache-python-ssl.outputs.cache-hit }}
+          ACTIONS_GOAL: ${{ matrix.goal }}
         run: |
+          echo "arch=${arch}" >> $GITHUB_ENV
+          echo "JID=${JID}" >> $GITHUB_ENV
+          echo "ACTIONS_CACHE=${ACTIONS_CACHE}" >> $GITHUB_ENV
+          echo "ACTIONS_GOAL=${ACTIONS_GOAL}" >> $GITHUB_ENV
           curl_version=$(curl --version | head -n 1 | awk '{ print $2 }')
           echo "cURL is ${curl_version}"
           if [ "$curl_version" == "7.68.0" ]; then
@@ -139,10 +148,6 @@ jobs:
 
       - name: Set env variables for test
         if: matrix.goal == 'test'
-        env:
-          JID: ${{ matrix.jid }}
-          ACTIONS_CACHE: ${{ steps.cache-python-ssl.outputs.cache-hit }}
-          ACTIONS_GOAL: ${{ matrix.goal }}
         run: |
              export PYTHON=$(which python3)
              export PIP=$(which pip3)
@@ -153,9 +158,6 @@ jobs:
              echo "PIP=${PIP}" >> $GITHUB_ENV
              echo "gam=${gam}" >> $GITHUB_ENV
              echo "gampath=${gampath}" >> $GITHUB_ENV
-             echo "JID=${JID}" >> $GITHUB_ENV
-             echo "ACTIONS_CACHE=${ACTIONS_CACHE}" >> $GITHUB_ENV
-             echo "ACTIONS_GOAL=${ACTIONS_GOAL}" >> $GITHUB_ENV
 
       - name: Install necessary Github-hosted Linux packages
         if: runner.os == 'Linux' && runner.arch == 'X64'
@@ -183,8 +185,6 @@ jobs:
       - name: Set Env Variables for build
         if: matrix.goal == 'build'
         env:
-          arch: ${{ matrix.arch }}
-          jid: ${{ matrix.jid }}
           openssl_archs: ${{ matrix.openssl_archs }}
           staticx: ${{ matrix.staticx }}
         run: |
@@ -227,9 +227,7 @@ jobs:
             echo "WIX_ARCH=${WIX_ARCH}" >> $GITHUB_ENV
           fi
           echo "We'll run make with: ${MAKEOPT}"
-          echo "JID=${jid}" >> $GITHUB_ENV
           echo "staticx=${staticx}" >> $GITHUB_ENV
-          echo "arch=${arch}" >> $GITHUB_ENV
           echo "LD_LIBRARY_PATH=${LD_LIBRARY_PATH}" >> $GITHUB_ENV
           echo "MAKE=${MAKE}" >> $GITHUB_ENV
           echo "MAKEOPT=${MAKEOPT}" >> $GITHUB_ENV