What's the tl;dr on these changes? Any new or removed jobs for CI/nightlies?

The commit comments speak for themselves, but this doesn't add or remove jobs.

@ruffsl please squash merge your pull requests. It really messes with cherry picking and general maintenance if I can't isolate a commit to a PR.

I wanted to maintain the line-level blame history for the CI changes, as it makes it easier to revert individual commits. Although commits to the default branch config.yaml shouldn't need to be cherry picked, 4c9b43f seems to map to the PR. I think as long as we don't push directly to the default branch but go through GH PRs, there will always be hyperlinks between squash/merge commits and originating PRs.

Well its really messed things up while trying to realign the 2 branches. I think its completely busted now and just needs to be redone. Please don’t do that in the future.

I have no idea how to fix this now, I did not expect there to be merge commits in the range and the output is really strange. Origin main I don’t think is repairable without hours of work. If you have 1 squashed commit that changes from master to main this would be easy to fix but I don’t see that anywhere in the history to pull from.

I thought I disabled merge commits without admin acknowledgement. I don’t know why that didn’t block this.