Skip to content

Commit 5e96d85

Browse files
committed
Merge branch 'master' into feature/add-api-key-ui-plugin
# Conflicts: # .github/workflows/validate-plugin-toml.yml
2 parents a233090 + 2ac4e18 commit 5e96d85

File tree

1 file changed

+3
-5
lines changed

1 file changed

+3
-5
lines changed

.github/workflows/validate-plugin-toml.yml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: Validate Plugin TOML
22

33
on:
4-
pull_request:
4+
pull_request_target:
55
branches:
66
- master
77
paths:
@@ -10,7 +10,6 @@ on:
1010
permissions:
1111
contents: read
1212
issues: write
13-
pull-requests: write
1413

1514
jobs:
1615
validate:
@@ -22,11 +21,12 @@ jobs:
2221
with:
2322
submodules: recursive
2423
fetch-depth: 0
24+
ref: ${{ github.event.pull_request.head.sha }}
2525

2626
- name: Get changed plugins
2727
id: changed
2828
run: |
29-
CHANGED_PLUGINS=$(git diff --name-only origin/${{ github.base_ref }}...HEAD | grep '^plugins/' | cut -d'/' -f2 | sort -u | tr '\n' ' ')
29+
CHANGED_PLUGINS=$(git diff --name-only origin/${{ github.base_ref }}...${{ github.event.pull_request.head.sha }} | grep '^plugins/' | cut -d'/' -f2 | sort -u | tr '\n' ' ')
3030
echo "plugins=$CHANGED_PLUGINS" >> $GITHUB_OUTPUT
3131
echo "Changed plugins: $CHANGED_PLUGINS"
3232
@@ -55,8 +55,6 @@ jobs:
5555
run: |
5656
pnpm validate ${{ steps.changed.outputs.plugins }}
5757
echo "result=success" >> $GITHUB_OUTPUT
58-
# If validation fails (exit 1), continue-on-error keeps the workflow running
59-
# but 'result=success' won't be written to GITHUB_OUTPUT
6058
6159
- name: Post validation comment
6260
if: always() && steps.changed.outputs.plugins != ''

0 commit comments

Comments
 (0)