trev/trevstack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Releases 9 Activity

fix: delete branch after merge
All checks were successful
Check / check (push) Successful in 50s
Details

Browse Source
This commit is contained in:
trev 2025-05-14 10:35:30 -04:00
parent 174d15de5b
commit 8158c195f5
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
.gitea/workflows/update.yaml
View File

@ -30,7 +30,7 @@ jobs:
run: | run: |
git config user.name "github-actions[bot]" git config user.name "github-actions[bot]"
git config user.email "41898282+github-actions[bot]@users.noreply.github.com" git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
git checkout -B create-pull-request/patch git checkout -B update
- name: Update - name: Update
run: nix run .#update run: nix run .#update
@ -42,19 +42,24 @@ jobs:
run: | run: |
REPO_OWNER_SLASH_NAME="${{ gitea.repository }}" REPO_OWNER_SLASH_NAME="${{ gitea.repository }}"
git push origin create-pull-request/patch --force if ! git ls-remote --exit-code origin update; then
CURRENT_PR=$(curl -s -X GET -H "Authorization: token $PAT" "https://$URL/api/v1/repos/$REPO_OWNER_SLASH_NAME/pulls/main/create-pull-request/patch") git push origin update --force
if [ "$( jq 'has("errors")' <<< $CURRENT_PR )" == "true" ]; then
PR_RESPONSE=$(curl -s -X POST -H "Authorization: token $PAT" \ PR_RESPONSE=$(curl -s -X POST -H "Authorization: token $PAT" \
-H "Content-Type: application/json" \ -H "Content-Type: application/json" \
-d '{"title":"update","body":"automatic update pr","head":"create-pull-request/patch","base":"main"}' \ -d '{"title":"update","body":"automatic update","head":"update","base":"main"}' \
"https://$URL/api/v1/repos/$REPO_OWNER_SLASH_NAME/pulls") "https://$URL/api/v1/repos/$REPO_OWNER_SLASH_NAME/pulls")
PR_NUMBER=$(echo "$PR_RESPONSE" | jq -r '.number') PR_NUMBER=$(echo "$PR_RESPONSE" | jq -r '.number')
curl -s -X POST -H "Authorization: token $PAT" \ curl -s -X POST -H "Authorization: token $PAT" \
-H "Content-Type: application/json" \ -H "Content-Type: application/json" \
-d '{"Do":"merge","merge_when_checks_succeed":true}' \ -d '{"Do":"merge","merge_when_checks_succeed":true,"delete_branch_after_merge":true}' \
"https://$URL/api/v1/repos/$REPO_OWNER_SLASH_NAME/pulls/$PR_NUMBER/merge" "https://$URL/api/v1/repos/$REPO_OWNER_SLASH_NAME/pulls/$PR_NUMBER/merge"
else
git push origin update --force
fi fi

1
.github/workflows/update.yaml vendored
View File

@ -39,6 +39,7 @@ jobs:
- name: Create Pull Request - name: Create Pull Request
uses: peter-evans/create-pull-request@v7 uses: peter-evans/create-pull-request@v7
with: with:
branch: update
title: update title: update
body: automatic update body: automatic update