diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
index d760ee27..697fdfed 100644
--- a/.github/workflows/push.yml
+++ b/.github/workflows/push.yml
@@ -35,7 +35,7 @@ jobs:
           fetch-depth: 0
 
       - name: Set git meta info
-        run: echo "GITHUB_CI_PR_SHA=${{github.event.pull_request.head.sha}}" >> "${GITHUB_ENV}"
+        run: echo "GITHUB_CI_PR_SHA=${{github.event.pull_request.head.sha}}" >> "${GITHUB_ENV}"  &&  echo "GITHUB_CI_CD=1" >> "${GITHUB_ENV}"
 
       - name: Install standalone reference GCC toolchain
         run: bash  scripts/env.sh
diff --git a/scripts/env.sh b/scripts/env.sh
index 7d65c924..111183f0 100755
--- a/scripts/env.sh
+++ b/scripts/env.sh
@@ -19,7 +19,7 @@ rm  md5.txt
 tar  xvjf  "${TARBALL}"
 rm  "${TARBALL}"
 
-if [ -n "${GITHUB_CI_PR_SHA}" ]; then
+if [ -n "${GITHUB_CI_PR_SHA}" ] || [ 1 -eq "${GITHUB_CI_CD}" ]; then
 	# This is for GitHub Actions CI/CD tooling only
 	echo  "export  PATH=\"${CURDIR}/${TARDIR}/bin\":\"\${PATH}\"" > build.env
 else