Skip to content

Commit ea0f5fa

Browse files
committed
ci: only match added/created submodules
1 parent 674ee8d commit ea0f5fa

File tree

1 file changed

+8
-4
lines changed

1 file changed

+8
-4
lines changed

.github/workflows/pull_request.yml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,11 @@ jobs:
3535
BASE_REF=${{ github.event.pull_request.base.sha }}
3636
HEAD_REF=${{ github.event.pull_request.head.sha }}
3737
38-
ADDED_SUBMODULES=$(git diff --submodule ${BASE_REF}..${HEAD_REF} | grep '^Submodule' | awk '{ print $2 }')
38+
ADDED_SUBMODULES=$(git diff --submodule --compact-summary remotes/base/${BASE_REF}..remotes/head/${HEAD_REF} | grep -oE "addons/(.*)/module($| [^(])")
3939
echo "Added submodules: $ADDED_SUBMODULES"
40-
echo "ADDED_SUBMODULES=$ADDED_SUBMODULES" >> $GITHUB_ENV
40+
echo "ADDED_SUBMODULES<<EOF" >> $GITHUB_ENV
41+
echo $ADDED_SUBMODULES
42+
echo 'EOF' >> $GITHUB_ENV
4143
4244
- name: Fetch submodules
4345
run: |
@@ -83,9 +85,11 @@ jobs:
8385
8486
- name: Detect Added Submodules
8587
run: |
86-
ADDED_SUBMODULES=$(git diff --submodule remotes/base/${BASE_REF}..remotes/head/${HEAD_REF} | grep '^Submodule' | awk '{ print $2 }')
88+
ADDED_SUBMODULES=$(git diff --submodule --compact-summary remotes/base/${BASE_REF}..remotes/head/${HEAD_REF} | grep -oE "addons/(.*)/module($| [^(])")
8789
echo "Added submodules: $ADDED_SUBMODULES"
88-
echo "ADDED_SUBMODULES=$ADDED_SUBMODULES" >> $GITHUB_ENV
90+
echo "ADDED_SUBMODULES<<EOF" >> $GITHUB_ENV
91+
echo $ADDED_SUBMODULES
92+
echo 'EOF' >> $GITHUB_ENV
8993
9094
- name: Fetch submodules
9195
run: |

0 commit comments

Comments
 (0)