diff --git a/.github/workflows/update-framework.yml b/.github/workflows/update-framework.yml index 9b11cae7f..263c180c5 100644 --- a/.github/workflows/update-framework.yml +++ b/.github/workflows/update-framework.yml @@ -59,6 +59,7 @@ jobs: - name: Commit and Create Pull Request env: GH_TOKEN: ${{ secrets.ACTIONS_BOT }} + DEFAULT_BRANCH: ${{ github.event.repository.default_branch }} PR_BODY: | **This is an automated pull-request** @@ -73,19 +74,19 @@ jobs: git push -f origin update-framework - PR_NUMBER=$(gh pr list --head "update-framework" --state open --template '{{range .}}{{ .number }}{{end}}') + PR_NUMBER=$(gh api --method GET "repos/${{ github.repository }}/pulls" -f head="${{ github.repository_owner }}:update-framework" -f base="$DEFAULT_BRANCH" -f state="open" --jq '.[0].number // empty') if [ -z "$PR_NUMBER" ]; then gh pr create \ --title "Update wp-cli framework" \ --body "$PR_BODY" \ --label "scope:framework" \ - --base "${{ github.event.repository.default_branch }}" \ + --base "$DEFAULT_BRANCH" \ --head "update-framework" else gh pr edit "$PR_NUMBER" \ --title "Update wp-cli framework" \ --body "$PR_BODY" \ --add-label "scope:framework" \ - --base "${{ github.event.repository.default_branch }}" + --base "$DEFAULT_BRANCH" fi fi