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

Init Git submodules after syncing with upstream repo #1823

Merged
merged 1 commit into from Dec 20, 2020

Conversation

fthomas
Copy link
Member

@fthomas fthomas commented Dec 20, 2020

Git submodules are now initialized after the latest changes from the
upstream repo are merged into Scala Steward's fork instead of directly
after cloning our fork and before changes are synced. I hope that this
is enough to ensure that our submodules are always in sync with the
submodules of the upstream repos.

If we're lucky, this closes #339.

Git submodules are now initialized after the latest changes from the
upstream repo are merged into Scala Steward's fork instead of directly
after cloning our fork and before changes are synced. I hope that this
is enough to ensure that our submodules are always in sync with the
submodules of the upstream repos.

If we're lucky, this closes #339.
@fthomas fthomas added the bug Something isn't working label Dec 20, 2020
@fthomas fthomas added this to the 0.9.0 milestone Dec 20, 2020
@codecov
Copy link

codecov bot commented Dec 20, 2020

Codecov Report

Merging #1823 (1eca53a) into master (22ecafb) will increase coverage by 0.12%.
The diff coverage is 86.66%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #1823      +/-   ##
==========================================
+ Coverage   74.68%   74.80%   +0.12%     
==========================================
  Files         123      123              
  Lines        2074     2076       +2     
  Branches       53       57       +4     
==========================================
+ Hits         1549     1553       +4     
+ Misses        525      523       -2     
Impacted Files Coverage Δ
...la/org/scalasteward/core/application/Context.scala 0.00% <ø> (ø)
...ala/org/scalasteward/core/nurture/NurtureAlg.scala 4.85% <0.00%> (+0.04%) ⬆️
...org/scalasteward/core/repocache/RepoCacheAlg.scala 0.00% <0.00%> (ø)
...n/scala/org/scalasteward/core/git/FileGitAlg.scala 100.00% <100.00%> (ø)
...in/scala/org/scalasteward/core/git/GenGitAlg.scala 95.83% <100.00%> (+0.18%) ⬆️
...n/scala/org/scalasteward/core/vcs/VCSRepoAlg.scala 100.00% <100.00%> (ø)

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 22ecafb...1eca53a. Read the comment docs.

@fthomas fthomas merged commit 2becea3 into master Dec 20, 2020
@fthomas fthomas deleted the topic/init-submodules-after-sync branch December 20, 2020 19:04
@fthomas
Copy link
Member Author

fthomas commented Dec 26, 2020

This seems to be working. Here are two PRs in a repo that has a submodule:

The first one was created before this PR was merged and contains changes to the submodule. The second PR was created after this PR has been merged and contains no changes to the submodule. \o/

@travisbrown
Copy link
Contributor

@fthomas This is great, thank you!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Do not update commits of submodules
2 participants