Skip to content

Commit 9dc1ca4

Browse files
authored
Merge pull request #790 from github/lcartey/fix-help-repo-fetch
Ensure help is always loaded during pack creation process
2 parents 6bd9ed7 + 839112f commit 9dc1ca4

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

Diff for: .github/workflows/code-scanning-pack-gen.yml

+6-4
Original file line numberDiff line numberDiff line change
@@ -68,15 +68,17 @@ jobs:
6868
- name: Determine ref for external help files
6969
id: determine-ref
7070
run: |
71-
if [[ $GITHUB_EVENT_NAME == "pull_request" || $GITHUB_EVENT_NAME == "merge_group" ]]; then
72-
echo "EXTERNAL_HELP_REF=$GITHUB_HEAD_REF" >> "$GITHUB_ENV"
71+
if [[ $GITHUB_EVENT_NAME == "pull_request" ]]; then
72+
EXTERNAL_HELP_REF="${{ github.event.pull_request.base.ref }}"
73+
elif [[ $GITHUB_EVENT_NAME == "merge_group" ]]; then
74+
EXTERNAL_HELP_REF="${{ github.event.merge_group.base_ref }}"
7375
else
74-
echo "EXTERNAL_HELP_REF=$GITHUB_REF" >> "$GITHUB_ENV"
76+
EXTERNAL_HELP_REF="$GITHUB_REF"
7577
fi
78+
echo "EXTERNAL_HELP_REF=$EXTERNAL_HELP_REF" >> "$GITHUB_ENV"
7679
echo "Using ref $EXTERNAL_HELP_REF for external help files."
7780
7881
- name: Checkout external help files
79-
continue-on-error: true
8082
id: checkout-external-help-files
8183
uses: actions/checkout@v4
8284
with:

0 commit comments

Comments
 (0)