From e3cf3c8c8cf94403a53d82a9fdd7437f3ef2b095 Mon Sep 17 00:00:00 2001 From: Victor Lin <13424970+victorlin@users.noreply.github.com> Date: Wed, 10 Apr 2024 11:10:33 -0700 Subject: [PATCH] Create PRs on other repos with GitHub CLI No functional change here except removal of the PR number from outputs (URL is more directly available and useful) --- .../make_pr_for_downstream_repo.yaml | 27 ++++++++++--------- 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/.github/workflows/make_pr_for_downstream_repo.yaml b/.github/workflows/make_pr_for_downstream_repo.yaml index fcf9871de..8c98a767f 100644 --- a/.github/workflows/make_pr_for_downstream_repo.yaml +++ b/.github/workflows/make_pr_for_downstream_repo.yaml @@ -65,14 +65,9 @@ jobs: - name: Create Pull Request id: cpr - uses: peter-evans/create-pull-request@v3 - with: - path: ${{ env.DESTINATION_REPO_DIR }} - token: ${{ secrets.GH_TOKEN_NEXTSTRAIN_BOT_REPO }} - branch: "nextstrain-bot/test-auspice-pr/${{ steps.detect-pr.outputs.pr-number }}" - commit-message: "[testing only] Upgrade Auspice to ${{ github.sha }}" - author: 'nextstrain-bot ' - committer: 'nextstrain-bot ' + working-directory: ${{ env.DESTINATION_REPO_DIR }} + env: + GITHUB_TOKEN: ${{ secrets.GH_TOKEN_NEXTSTRAIN_BOT_REPO }} title: '[bot] [DO NOT MERGE] Test Auspice PR ${{ steps.detect-pr.outputs.pr-number }}' body: | This PR has been created to test this project running Auspice with changes from https://github.com/nextstrain/auspice/pull/${{ steps.detect-pr.outputs.pr-number }}. @@ -81,10 +76,18 @@ jobs: This will surface any issues that can arise from merging the PR in Auspice. To address these issues locally, update the source branch (e.g. with a git rebase). This message and corresponding commits were automatically created by a GitHub Action from [nextstrain/auspice](https://github.com/nextstrain/auspice). - draft: true - delete-branch: true + body_file: pr_body.txt + run: | + git config user.name "nextstrain-bot" + git config user.email "nextstrain-bot@users.noreply.github.com" + + git switch -c "nextstrain-bot/test-auspice-pr/${{ steps.detect-pr.outputs.pr-number }}" + git commit --message="[testing only] Upgrade Auspice to ${{ github.sha }}" + + echo "$body" > "$body_file" + pr_url="$(gh pr create --title "$title" --body-file "$body_file" --draft)" + echo "pr_url=$pr_url" >> "$GITHUB_OUTPUT" - name: Check outputs run: | - echo "PR number: ${{ steps.cpr.outputs.pull-request-number }}" - echo "PR URL: ${{ steps.cpr.outputs.pull-request-url }}" + echo "PR URL: ${{ steps.cpr.outputs.pr_url }}"