push.yml/env.sh: set helper variable to indicate building on github m…

…ore explicitly regardless build status (PR,merge,etc.) // hopefully fix for #167 (#169)
hydrabus · Apr 10, 2024 · da4f293 · da4f293
1 parent ecfb2cc
commit da4f293
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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