Skip to content

Conversation

@ryannikolaidis
Copy link
Contributor

@ryannikolaidis ryannikolaidis commented Oct 5, 2023

Closes #1482

There are two known issues when attempting to merge PRs via merge queue:

  • CodeQL fails with:
Error: ref 'refs/heads/gh-readonly-queue/main/pr-968-499f37f64b27c66d4fc68446dbea519860d06cf7' not found in this repository
  • CI.changelog fails with:
Get current git ref
Error: The process '/usr/bin/git' failed with exit code [1](https://github.com/Unstructured-IO/unstructured/actions/runs/5735977683/job/15544656682#step:2:1)28

The error with CodeQL is a known and still open issue. We don't current enforce branch protection for CodeQL, so probably our best compromise is to simply not run this on the merge queue event. There could be a narrow margin where some issue is introduced via merge, but we'll still see issues on individual branches and on pushes to main, so this is probably acceptable.

The changelog job now has a checkout step prior to paths-filter which guarantees the git ref exists before attempting to execute the filter action.

Testing

Prior to this change, I was able to validate both the CodeQL and changelog test errors

With these changes, validated that the merge queue was able to successfully run the changelog CI job.

skip codeql
@ryannikolaidis ryannikolaidis marked this pull request as ready for review October 5, 2023 19:51
Copy link
Contributor

@cragwolfe cragwolfe left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🙌

@ryannikolaidis ryannikolaidis enabled auto-merge (squash) October 5, 2023 20:01
@ryannikolaidis ryannikolaidis added this pull request to the merge queue Oct 5, 2023
Merged via the queue into main with commit 1e32da6 Oct 5, 2023
@ryannikolaidis ryannikolaidis deleted the ryan/merge-queue-fixes branch October 5, 2023 22:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

feat: github merge queues

3 participants