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

Update "Set default branch explicitly" #316

Merged
merged 12 commits into from
Oct 8, 2021

Conversation

timholy
Copy link
Member

@timholy timholy commented Oct 2, 2021

#243 seems like an important change. This is my attempt to bring it up to date. This seems reasonable now.

@timholy timholy force-pushed the teh/cdg/default-branch branch from d04f3bd to 60b3f06 Compare October 2, 2021 18:36
@codecov
Copy link

codecov bot commented Oct 2, 2021

Codecov Report

Merging #316 (9c21994) into master (12fb463) will increase coverage by 0.42%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff             @@
##           master     #316      +/-   ##
==========================================
+ Coverage   94.32%   94.75%   +0.42%     
==========================================
  Files          20       20              
  Lines         617      610       -7     
==========================================
- Hits          582      578       -4     
+ Misses         35       32       -3     
Impacted Files Coverage Δ
src/plugins/ci.jl 98.66% <ø> (ø)
src/plugins/coverage.jl 90.90% <ø> (ø)
src/plugins/git.jl 95.08% <ø> (+1.53%) ⬆️
src/plugins/project_file.jl 88.88% <0.00%> (-1.12%) ⬇️
src/template.jl 98.41% <0.00%> (-0.03%) ⬇️
src/plugins/badges.jl 100.00% <0.00%> (ø)
src/plugins/src_dir.jl 100.00% <0.00%> (ø)
src/plugins/documenter.jl 86.95% <0.00%> (+2.89%) ⬆️

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 12fb463...9c21994. Read the comment docs.

@timholy timholy force-pushed the teh/cdg/default-branch branch from db4f3bd to 1241232 Compare October 2, 2021 21:36
@timholy
Copy link
Member Author

timholy commented Oct 2, 2021

This is finally passing. I just disabled certain problematic tests for Windows; since this package isn't something I know a lot about, that just seems expedient. I could file an issue as a reminder to turn on Windows again some day. (The error was quite strange, a permissions error on a directory & file created by mktemp(). That doesn't seem like it should happen. But I can't easily debug it locally, and for all I know it's a CI-only error.)

@timholy timholy force-pushed the teh/cdg/default-branch branch from 1241232 to 56a9b40 Compare October 7, 2021 11:42
The transition from SimpleMocking to Mocking occurred after this PR
was initially submitted.
@timholy timholy force-pushed the teh/cdg/default-branch branch from 56a9b40 to fe008fb Compare October 7, 2021 12:09
@timholy
Copy link
Member Author

timholy commented Oct 7, 2021

I believe I have fixed all the weirdnesses; my changes are limited to a single commit (the last). Short, easy to review. Can we merge this and register a new release? In about 10 days I will be teaching a class to Julia newbies, and I'd really rather not have to write a whole page of documentation about how to manually update all dangling references from master => main.

@nickrobinson251
Copy link
Collaborator

Yes, this LGTM, but i've not had time to review in depth.

@mjram0s do you happen to have time to take a quick look?

Either way, i will merge and register a new version this evening :)

@nickrobinson251
Copy link
Collaborator

And thank you so much for taking this on, @timholy!

@mjram0s
Copy link
Contributor

mjram0s commented Oct 7, 2021

I can take a look at this today!

timholy and others added 2 commits October 8, 2021 03:06
@timholy
Copy link
Member Author

timholy commented Oct 8, 2021

@mjram0s, can we do a 1.5->1.6 update later? I'm not sure what's going on but clearly it's not a 2-line fix; there are slightly different Manifest files loaded on different Julia versions; I don't think there's anything fundamental going on here, it's just all dumb bookkeeping differences that I lack the time to track down now. I'm going to revert the last couple of commits on this branch.

@nickrobinson251 nickrobinson251 merged commit 7ba145a into JuliaCI:master Oct 8, 2021
@nickrobinson251
Copy link
Collaborator

Thanks again, Tim! I'll register a new version now

Update the tests from 1.5 -> 1.6 involves a bit of work, but you're absolutely right MJ that we're overdue doing it! #313

@timholy timholy deleted the teh/cdg/default-branch branch October 8, 2021 09:35
@christopher-dG
Copy link
Member

Thanks for finishing this up for me! ❤️

@timholy
Copy link
Member Author

timholy commented Oct 8, 2021

You did all the hard work, my contribution ended up being a few lines. And I learned a bit (just a bit...) about the internals of an important package for the ecosystem. Thanks again for everything you've done for this package!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants