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

switch to the main branch #715

Merged
merged 8 commits into from
Dec 20, 2023
Merged

switch to the main branch #715

merged 8 commits into from
Dec 20, 2023

Conversation

kdorheim
Copy link
Contributor

This is to address #697 to change from the default branch from being master to main. To do this will need to update the github action files and documentation.

gaelforget and others added 8 commits July 20, 2023 16:31
* Update model version constant to 3.1.0

* Return gmst instead of tas; update model version (#705)

* Add video and tutorial links

* Update to reflect BBL's PR feedback.

---------

Co-authored-by: Robert Gieseke <[email protected]>
Expand the fetchvars documentation.
fix : convert trailing comments to single sline comments
@kdorheim kdorheim changed the title swtich to the main branch switch to the main branch Sep 12, 2023
@github-actions
Copy link

Differences in Hector outputs

Hello, this is leeyabot!

The current pull request's outputs do not differ from 3.0.0 (9aebf67).

@codecov-commenter
Copy link

Codecov Report

❗ No coverage uploaded for pull request base (dev@c452322). Click here to learn what that means.
The diff coverage is n/a.

❗ Current head 346aad6 differs from pull request most recent head b6946af. Consider uploading reports for the commit b6946af to get more accurate results

@@          Coverage Diff           @@
##             dev     #715   +/-   ##
======================================
  Coverage       ?   79.72%           
======================================
  Files          ?       61           
  Lines          ?     5978           
  Branches       ?        0           
======================================
  Hits           ?     4766           
  Misses         ?     1212           
  Partials       ?        0           

@kdorheim kdorheim linked an issue Sep 12, 2023 that may be closed by this pull request
@kdorheim
Copy link
Contributor Author

@bpbond and @crvernon this should address the code changes fro #697 , I think. I think the outstanding TODOs would be to change the default branch on github and then the default branch on code cov. Do we do that now? Or wait until this is merged into master and then update? Does it need a new release associated with that change? What do you think?

@kdorheim kdorheim marked this pull request as ready for review September 12, 2023 18:09
Copy link
Member

@bpbond bpbond left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This seems fine; thanks @kdorheim

@@ -3,7 +3,7 @@ name: R-CMD-check
on:
push:
branches:
- master
- main
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Or do we want to just add - main for now, do the branch switch, ensure everything working, and then finally delete the - main line?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good point idk, I guess it depends on what the order of merging is and such.

@bpbond
Copy link
Member

bpbond commented Sep 13, 2023

@kdorheim I'm not sure of the best sequence here, but I guess I would merge this into master and then update the branch name. Don't see the need for a new release since there's no code change.

@kdorheim
Copy link
Contributor Author

@kdorheim I'm not sure of the best sequence here, but I guess I would merge this into master and then update the branch name. Don't see the need for a new release since there's no code change.

Yea I am also at a loss here 🤷‍♀️

@kdorheim kdorheim changed the base branch from dev to master December 20, 2023 22:22
@kdorheim kdorheim merged commit 0ea644b into master Dec 20, 2023
10 checks passed
@kdorheim kdorheim deleted the krd/gh697/change_default_branch branch January 17, 2024 22:13
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.

Change default branch from master to main
4 participants