Skip to content
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

Draft
wants to merge 3 commits into
base: main
Choose a base branch
from

Conversation

lzaoral
Copy link
Contributor

@lzaoral lzaoral commented May 11, 2022

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.

@lzaoral lzaoral self-assigned this May 11, 2022
@lzaoral
Copy link
Contributor Author

lzaoral commented May 11, 2022

Requires staticafi/sbt-instrumentation#65 and staticafi/sbt-instrumentation#66 as master of dg is not compatible with current master of sbt-instrumentation.

I'm not going to move the HEAD of dg in this PR.

@lzaoral lzaoral force-pushed the submodule-always-track-master branch from a54f658 to d9a3c0e Compare May 14, 2022 16:59
@lzaoral
Copy link
Contributor Author

lzaoral commented May 14, 2022

@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.

@lzaoral lzaoral force-pushed the submodule-always-track-master branch from d9a3c0e to f09a8e0 Compare May 14, 2022 17:40
@lzaoral lzaoral changed the title WIP: Make submodules track master branches Make submodules track master branches May 14, 2022
@lzaoral lzaoral marked this pull request as ready for review May 14, 2022 18:16
@lzaoral lzaoral requested review from mchalupa and trtikm May 14, 2022 18:16
Copy link
Member

@mchalupa mchalupa left a 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
Copy link
Member

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?

Copy link
Contributor Author

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.

@lzaoral
Copy link
Contributor Author

lzaoral commented May 30, 2022

That is, finish merging SV-COMP 22 changes to modules, create new main branches and then merge this PR changed to track main branches.

That's a really good idea, @mchalupa! I'll mark this PR as a draft for now.

@lzaoral lzaoral marked this pull request as draft May 30, 2022 16:05
@lzaoral lzaoral changed the base branch from symbiotic9.1 to main December 16, 2022 12:55
@lzaoral lzaoral removed their assignment Feb 20, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants