From 66bb51a17488efcb4c6551911d2897d7c9cdaa79 Mon Sep 17 00:00:00 2001 From: Jan Nowakowski Date: Wed, 22 Jan 2025 15:20:33 +0100 Subject: [PATCH 1/2] Pick PR number from issue description --- .github/workflows/testBuildHybrid.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/testBuildHybrid.yml b/.github/workflows/testBuildHybrid.yml index 549349887e3d..ea1e3cc73dde 100644 --- a/.github/workflows/testBuildHybrid.yml +++ b/.github/workflows/testBuildHybrid.yml @@ -77,11 +77,11 @@ jobs: const pullRequest = await github.rest.pulls.get({ owner: context.repo.owner, repo: context.repo.repo, - pull_number: env.PULL_REQUEST_NUMBER, + pull_number: '${{env.PULL_REQUEST_NUMBER }}'', }); const body = pullRequest.data.body; - const regex = /MOBILE-EXPENSIFY:(?.*)/; + const regex = /MOBILE-EXPENSIFY:(?\d+)/; const found = body.match(regex)?.groups?.prNumber || ""; return found.trim(); From ec9ff65045149e97fee72c307c3966c53c2ac099 Mon Sep 17 00:00:00 2001 From: Jan Nowakowski Date: Wed, 22 Jan 2025 16:23:19 +0100 Subject: [PATCH 2/2] Checkout and point gh to submodule --- .github/workflows/testBuildHybrid.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/testBuildHybrid.yml b/.github/workflows/testBuildHybrid.yml index ea1e3cc73dde..db40942316b1 100644 --- a/.github/workflows/testBuildHybrid.yml +++ b/.github/workflows/testBuildHybrid.yml @@ -77,7 +77,7 @@ jobs: const pullRequest = await github.rest.pulls.get({ owner: context.repo.owner, repo: context.repo.repo, - pull_number: '${{env.PULL_REQUEST_NUMBER }}'', + pull_number: '${{ env.PULL_REQUEST_NUMBER }}'', }); const body = pullRequest.data.body; @@ -93,11 +93,14 @@ jobs: outputs: OLD_DOT_REF: ${{ steps.getHeadRef.outputs.REF }} steps: + - name: Checkout + uses: actions/checkout@v4 + - name: Check if pull request number is correct id: getHeadRef run: | set -e - echo "REF=$(gh pr view ${{ needs.getOldDotPR.outputs.OLD_DOT_PR }} --json headRefOid --jq '.headRefOid')" >> "$GITHUB_OUTPUT" + echo "REF=$(gh pr view ${{ needs.getOldDotPR.outputs.OLD_DOT_PR }} -R 'Expensify/Mobile-Expensify' --json headRefOid --jq '.headRefOid')" >> "$GITHUB_OUTPUT" env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}