Skip to content

ci(update-3rdparty): fix broken push and add permission check #59464

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
joshtrichards wants to merge 2 commits into
base: master
Choose a base branch
from
+16 −7
Open

ci(update-3rdparty): fix broken push and add permission check #59464

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7179f9e
ci(update-3rdparty): add permission check and fix broken push
joshtrichards Apr 6, 2026
780e3f9
chore: re-add accidentally dropped comments
joshtrichards Apr 6, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 16 additions & 7 deletions .github/workflows/command-pull-3rdparty.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,11 @@ jobs:
if: github.event.issue.pull_request != '' && startsWith(github.event.comment.body, '/update-3rdparty')

steps:
- name: Check actor permission
uses: skjnldsv/check-actor-permission@69e92a3c4711150929bca9fcf34448c5bf5526e7 # v2
with:
require: write

- name: Add reaction on start
uses: peter-evans/create-or-update-comment@e8674b075228eee787fea43ef493e45ece1004c9 # v3.0.1
with:
Expand Down Expand Up @@ -64,14 +69,15 @@ jobs:
ref: ${{ steps.comment-branch.outputs.head_ref }}

- name: Register server reference to fallback to master branch
env:
BASE_REF: ${{ steps.get-pr.outputs.base_ref }}
run: |
base_ref="${{ steps.get-pr.outputs.base_ref }}"
if [[ "$base_ref" == "main" || "$base_ref" == "master" ]]; then
if [[ "$BASE_REF" == "main" || "$BASE_REF" == "master" ]]; then
echo "server_ref=master" >> "$GITHUB_ENV"
echo "Setting server_ref to master"
elif [[ "$base_ref" =~ ^stable[0-9]+$ ]]; then
echo "server_ref=$base_ref" >> "$GITHUB_ENV"
echo "Setting server_ref to $base_ref"
elif [[ "$BASE_REF" =~ ^stable[0-9]+$ ]]; then
echo "server_ref=$BASE_REF" >> "$GITHUB_ENV"
echo "Setting server_ref to $BASE_REF"
else
echo "Not based on master/main/stable*, so skipping pull 3rdparty command"
fi
Expand All @@ -92,13 +98,16 @@ jobs:

- name: Pull 3rdparty
if: ${{ env.server_ref != '' }}
Copy link
Copy Markdown
Contributor

@miaulalala miaulalala Apr 7, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Switch away from env.server_ref here too?

run: git submodule foreach 'if [ "$sm_path" == "3rdparty" ]; then git pull origin '"'"'${{ env.server_ref }}'"'"'; fi'
run: git submodule foreach 'if [ "$sm_path" == "3rdparty" ]; then git pull origin "'"$server_ref"'"; fi'
Copy link
Copy Markdown
Member

@nickvergessen nickvergessen Apr 7, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this changes the quotes from single to double quotes


- name: Commit and push changes
if: ${{ env.server_ref != '' }}
env:
BOT_TOKEN: ${{ secrets.COMMAND_BOT_PAT }}
run: |
git remote set-url origin "https://x-access-token:${BOT_TOKEN}@github.com/${{ github.repository }}.git"
git add 3rdparty
git commit -s -m 'Update submodule 3rdparty to latest ${{ env.server_ref }}'
git commit -s -m "Update submodule 3rdparty to latest ${server_ref}"
git push

- name: Add reaction on failure
Expand Down
Loading