Skip to content

ci: streamline CI actions to prepare for merge queue introduction#3582

Merged
djc merged 6 commits intomasterfrom
ci/conclusion
Jan 4, 2024
Merged

ci: streamline CI actions to prepare for merge queue introduction#3582
djc merged 6 commits intomasterfrom
ci/conclusion

Conversation

@rami3l
Copy link
Copy Markdown
Member

@rami3l rami3l commented Dec 14, 2023

This is one of the prerequisites for closing #3567.

Changes

  • Merge all *-on-*.yaml into ci.yaml.
  • Merge all-features into ci.yaml.
  • Merge test-docs into ci.yaml.
  • Add freebsd-builds to ci.yaml.
  • Add conclusion to ci.yaml.
  • Make the CI fail if the generated ci.yaml is not up to date.

@rami3l rami3l force-pushed the ci/conclusion branch 5 times, most recently from 4caa051 to b94646d Compare December 14, 2023 07:29
@rami3l rami3l force-pushed the ci/conclusion branch 13 times, most recently from bc923b4 to 9a977c3 Compare December 18, 2023 03:21
@rami3l rami3l marked this pull request as ready for review December 18, 2023 03:22
Copy link
Copy Markdown
Member Author

@rami3l rami3l Dec 18, 2023

Choose a reason for hiding this comment

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

This file is generated by the script, please ignore it while reviewing.

PS: Actually, it's probably better to ignore .github/workflows/** changes entirely.

@rami3l rami3l requested a review from djc December 18, 2023 03:32
Copy link
Copy Markdown
Contributor

@djc djc left a comment

Choose a reason for hiding this comment

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

Yeah, I think that makes sense. Thanks for working through this!

@djc djc merged commit d67cc98 into master Jan 4, 2024
@djc djc deleted the ci/conclusion branch January 4, 2024 14:55
@rami3l
Copy link
Copy Markdown
Member Author

rami3l commented Jan 4, 2024

@djc Concern: If I'm not mistaken, the conditional if: ${{ (github.event.push && github.ref_name == 'master') || github.event.schedule }} doesn't seem to work (returns false on the latest master push), and it unfortunately hasn't been tested on PR.

The conditional is necessary since we want the workflow to always run to qualify for being used in branch protection.

What could've happened?

PS: This should not influence the future merge queue integration though, since it depends on a separate merge_group case.

@rami3l
Copy link
Copy Markdown
Member Author

rami3l commented Jan 4, 2024

... I checked the docs again and I don't see why, but probably we should use github.event_name == 'push' instead of github.event.push?

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.

2 participants