-
Notifications
You must be signed in to change notification settings - Fork 54
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Make submodules track master branches #227
base: main
Are you sure you want to change the base?
Conversation
I'm not going to move the HEAD of |
a54f658
to
d9a3c0e
Compare
@trtikm We can use GitHub's Dependabot to automatically create PRs with submodule updates, run the build and test-suite and merge them if it succeeds. That should be much safer and less breakage-prone than to always pull HEAD of the submodule in the build script and not necessarily testing the new version in CI. |
The same setting was already applied for dg and sbt-{intrumentation,slicer}.
d9a3c0e
to
f09a8e0
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Git started recently using main
as the "master" branch. If we want to follow this convention, I think this is the right point where to start. That is, finish merging SV-COMP 22 changes to modules, create new main
branches and then merge this PR changed to track main
branches. If you want to continue with master
branches, I'll approve the commit.
[submodule "klee"] | ||
path = klee | ||
url = https://github.com/staticafi/klee | ||
ignore = untracked | ||
branch = 9.0.0-dev |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
KLEE won't have the master branch stable?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
At the moment, KLEE does not contain any branch that's called master
or main
and 9.0.0-dev
seems to be the latest development branch at the moment.
That's a really good idea, @mchalupa! I'll mark this PR as a draft for now. |
As agreed on Monday's (9. 5.) meeting, from now on the submodules should track changes in corresponding
master
branches only. Only these branches are now considered to be stable.If you want to update the modules to the HEAD, just run
git submodule update --remote
and commit the changes to this repo.