Skip to content

Commit

Permalink
push.yml/env.sh: set helper variable to indicate building on github m…
Browse files Browse the repository at this point in the history
…ore explicitly regardless build status (PR,merge,etc.) // hopefully fix for #167 (#169)
  • Loading branch information
ia authored Apr 10, 2024
1 parent ecfb2cc commit da4f293
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion scripts/env.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit da4f293

Please sign in to comment.