Skip to content

Commit

Permalink
Fix stale merge commit issue in private CI
Browse files Browse the repository at this point in the history
  • Loading branch information
nbdd0121 authored and GregAC committed Feb 5, 2024
1 parent 7049d4d commit 4f96e54
Showing 1 changed file with 30 additions and 1 deletion.
31 changes: 30 additions & 1 deletion .github/workflows/private-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,35 @@ jobs:
name: Trigger Private CI
runs-on: ubuntu-latest
steps:
# Find a merge commit. We cannot use merge_commit_sha from context directly because
# mergeability check is asynchronous to pull_request_target trigger..
- name: Find the merge commit
id: merge
if: github.event_name == 'pull_request_target'
uses: actions/github-script@v7
with:
script: |
for (let i = 0; i <= 5; i++) {
const { data: pr } = await github.rest.pulls.get({
owner: context.repo.owner,
repo: context.repo.repo,
pull_number: context.issue.number,
});
if (i != 5 && pr.mergeable == null) {
console.log("Mergeability check in progress");
await new Promise(r => setTimeout(r, 2000));
continue;
}
if (pr.mergeable) {
core.setOutput('merge_sha', pr.merge_commit_sha);
} else {
core.setFailed('Pull request is not mergeable');
}
break;
}
# Create pending statuses to block merge group and give indication before jobs are picked up.
- name: Create pending statuses
run: |
Expand All @@ -40,6 +69,6 @@ jobs:
run: |
gh workflow run ibex-private-ci.yml --repo lowRISC/lowrisc-private-ci \
-f ref="${{ github.event.pull_request.head.sha || github.sha }}" \
-f sha="${{ github.event.pull_request.merge_commit_sha || github.sha }}"
-f sha="${{ steps.merge.outputs.merge_sha || github.sha }}"
env:
GITHUB_TOKEN: ${{ secrets.LOWRISC_PRIVATE_CI_PAT }}

0 comments on commit 4f96e54

Please sign in to comment.