CI: run on main and fix check-changes base for Sturmgeist fork#2
CI: run on main and fix check-changes base for Sturmgeist fork#2
Conversation
Track default upstream ref in .upstream-remote-branch (origin/main) and stop ignoring it so pixi check-changes and local tooling resolve the base branch. Extend GitHub Actions triggers and branch guards to accept main alongside master. Update release.sh to push the current branch when on main or master. Co-authored-by: Tim Fox <timfox@outlook.com>
![chatgpt-codex-connector[bot]](https://avatars.githubusercontent.com/in/1144995?s=60&v=4){kind=small}
There was a problem hiding this comment.
💡 Codex Review
Here are some automated review suggestions for this pull request.
Reviewed commit: 7fbb737f39
ℹ️ About Codex in GitHub
Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you
- Open a pull request for review
- Mark a draft as ready
- Comment "@codex review".
If Codex has suggestions, it will comment; otherwise it will react with 👍.
Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".
| - name: Check changes | ||
| run: | | ||
| pixi run check-changes --github "origin/master" | ||
| pixi run check-changes --github "origin/main" |
There was a problem hiding this comment.
The workflow now runs on both main and master (pull_request/push at lines 13-16), but this step always compares against origin/main. Because check-changes passes that value into etl_lib.get_commits() (which uses git rev-list ...<base> symmetric-difference logic), runs triggered from master can include unrelated commits from main and report formatting failures on files not touched by the master change. Please select the base ref dynamically from the triggering branch (or PR base branch) so master events are compared to origin/master.
Useful? React with 👍 / 👎.
2 participants
Summary
The fork uses
mainas the default branch while upstream ET: Legacy still usesmaster. GitHub Actions was only listening onmaster, so pushes and PRs tomaindid not run CI. The pre-build step also invokedcheck-changesagainstorigin/master, which does not exist on this fork.Changes
mainandmaster, and compare formatting againstorigin/mainin the pixi step.mainas well asmaster(upload, docker, SignPath snapshot conditions, Discord failure notify, Linux/Android build machines)..upstream-remote-branchcontainingorigin/mainsomisc/check-changes.py(viaetl_lib) uses the correct merge base, and remove that path from.gitignoreso the file is tracked for the fork.release.sh: allow running onmainormasterand push the current branch name instead of hard-codingmaster.Verification
actionlintv1.7.7 was run locally on.github/workflows/*.ymlwith no findings.After merge, confirm the Actions tab shows a CI run for
mainon the next push.