Skip to content

Commit b43e6cc

Browse files
short-term-fix (#530)
Summary: - Mandatory `actions/cache` upgrade. - Hack for secret dependent `docker` flow under fork PRs. Temp fix at best.
1 parent cbaa4a1 commit b43e6cc

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

.github/workflows/build.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ env:
3535
PLANCACHEENABLED: "false"
3636
CI_IS_EXPRESS: ${{ github.ref_type == 'tag' && contains(github.ref_name, 'express') && 'true' || 'false' }}
3737
STACKQL_IMAGE_NAME: ${{ vars.STACKQL_IMAGE_NAME != '' && vars.STACKQL_IMAGE_NAME || (github.repository == 'stackql/stackql' || github.repository == 'stackql/stackql-devel') && github.repository || 'stackql/stackql' }}
38+
IS_FORK_PR: ${{ github.event.pull_request.head.repo.full_name == github.repository && 'false' || 'true' }}
3839

3940
jobs:
4041

@@ -68,8 +69,7 @@ jobs:
6869

6970
- name: Cache Chocolatey packages
7071
id: cache-choco
71-
# uses: actions/cache@v3
72-
uses: actions/[email protected]
72+
uses: actions/cache@v4
7373
env:
7474
cache-name: cache-choco-packages
7575
with:
@@ -1268,7 +1268,7 @@ jobs:
12681268
run: |
12691269
BUILD_IMAGE_REQUIRED="true"
12701270
PUSH_IMAGE_REQUIRED="false"
1271-
if [ "$( grep '^build-elide.*' <<< '${{ github.ref_name }}' )" != "" ]; then
1271+
if [ "$( grep '^build-elide.*' <<< '${{ github.ref_name }}' )" != "" ] || [ "${{ env.IS_FORK_PR }}" = "true" ]; then
12721272
BUILD_IMAGE_REQUIRED="false"
12731273
fi
12741274
# shellcheck disable=SC2235
@@ -1419,7 +1419,7 @@ jobs:
14191419
run: |
14201420
BUILD_IMAGE_REQUIRED="true"
14211421
PUSH_IMAGE_REQUIRED="false"
1422-
if [ "$( grep '^build-elide.*' <<< '${{ github.ref_name }}' )" != "" ]; then
1422+
if [ "$( grep '^build-elide.*' <<< '${{ github.ref_name }}' )" != "" ] || [ "${{ env.IS_FORK_PR }}" = "true" ]; then
14231423
BUILD_IMAGE_REQUIRED="false"
14241424
fi
14251425
# shellcheck disable=SC2235

0 commit comments

Comments
 (0)