From 7e15f7191631a2f50fabae940a8affe808793aca Mon Sep 17 00:00:00 2001 From: anatawa12 Date: Tue, 24 Oct 2023 14:02:06 +0900 Subject: [PATCH] ci: fix pullreq number may not get correctly (#12127) * Revert "remove save-pr-number" This reverts commit 085f4bd76992fa0b3e4219a5c132b72f68c3d2cc. * Revert "Update report-api-diff.yml" This reverts commit b73daf4c0ec4240ea39b183a6b93f209b63e6d81. * Revert "Update report-api-diff.yml" This reverts commit cbf2b5ad8a7cba769446fa9bcf1f129c6f03db8c. * Revert "try to get pull request id from github.event.workflow_run.pull_requests" This reverts commit 07517ce501c12e75da03d325c23968d75ac37d00. --- .github/workflows/get-api-diff.yml | 13 +++++++++++++ .github/workflows/report-api-diff.yml | 9 +-------- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/.github/workflows/get-api-diff.yml b/.github/workflows/get-api-diff.yml index 6454de080c..eeb2fa0855 100644 --- a/.github/workflows/get-api-diff.yml +++ b/.github/workflows/get-api-diff.yml @@ -171,3 +171,16 @@ jobs: path: api-head.json - name: Kill Misskey Job run: screen -S misskey -X quit + + save-pr-number: + runs-on: ubuntu-latest + steps: + - name: Save PR number + env: + PR_NUMBER: ${{ github.event.number }} + run: | + echo "$PR_NUMBER" > ./pr_number + - uses: actions/upload-artifact@v3 + with: + name: api-artifact + path: pr_number diff --git a/.github/workflows/report-api-diff.yml b/.github/workflows/report-api-diff.yml index 9e7f47f923..55d13100fb 100644 --- a/.github/workflows/report-api-diff.yml +++ b/.github/workflows/report-api-diff.yml @@ -39,14 +39,7 @@ jobs: run: unzip api-artifact.zip -d artifacts - name: Load PR Number id: load-pr-num - env: - PULL_REQUESTS: ${{ toJson(github.event.workflow_run.pull_requests.*) }} - REPO_ID: ${{ github.repository_id }} - run: | - # find first pull requests that targets this repository - PR_NUMBER="$(echo "$PULL_REQUESTS" \ - | jq --arg REPO_ID "$REPO_ID" '[.[] | select ($REPO_ID == (.base.repo.id | tostring)) | .number ][0]')" - echo "pr-number=$PR_NUMBER" >> "$GITHUB_OUTPUT" + run: echo "pr-number=$(cat artifacts/pr_number)" >> "$GITHUB_OUTPUT" - name: Output base run: cat ./artifacts/api-base.json