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

Release changes 1.15 #5925

Closed
wants to merge 6 commits into from
Closed

Release changes 1.15 #5925

wants to merge 6 commits into from

Conversation

TysonStanley
Copy link
Member

The changes made during the release process to CRAN (minor adjustments and version bump for the tag).

added resubmission note, updated numbers
As part of release check, found a few locations where L should be included
src/init.c Show resolved Hide resolved
@TysonStanley
Copy link
Member Author

Added version bump to 1.15.99 for merging to master

Copy link

codecov bot commented Jan 30, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (6f43a96) 97.48% compared to head (3bfe51e) 97.48%.

Additional details and impacted files
@@           Coverage Diff           @@
##           master    #5925   +/-   ##
=======================================
  Coverage   97.48%   97.48%           
=======================================
  Files          80       80           
  Lines       14862    14862           
=======================================
  Hits        14488    14488           
  Misses        374      374           

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@ben-schwen
Copy link
Member

@TysonStanley could you also update the NEWS file to 1.15.0, stating when it was submitted to CRAN and then retag 1.15.0 (at least that's what Matt always did)

@TysonStanley
Copy link
Member Author

Kept the date to match the CRAN version even though that is the initial date and not the resubmission date. In the future releases, will be the resubmission date (where necessary).

@TysonStanley
Copy link
Member Author

Using this branch for the tag. Would recommend merging at least the first two commits here for the master branch when we bring 1.15.99 into master.

@MichaelChirico
Copy link
Member

Using this branch for the tag. Would recommend merging at least the first two commits here for the master branch when we bring 1.15.99 into master.

planning to rebase the 1-15-99 branch once this is in master to have the cleanest possible history

@TysonStanley
Copy link
Member Author

Sounds good. The tag is created. Do you want me to create a new PR with just the relevant commits for master?

@ben-schwen
Copy link
Member

I guess we are good with this PR

Closes #5931 #5924

@tdhock tdhock mentioned this pull request Feb 13, 2024
@tdhock
Copy link
Member

tdhock commented Feb 13, 2024

Hi, I don't know if we still care to follow CRAN_Release.cmd, which says the following:

# DO NOT commit or push to GitHub. Leave 4 files (.dev/CRAN_Release.cmd, DESCRIPTION, NEWS and init.c) edited and not committed. Include these in a single and final bump commit below.
# DO NOT even use a PR. Because PRs build binaries and we don't want any binary versions of even release numbers available from anywhere other than CRAN.
# Leave milestone open with a 'release checks' issue open. Keep updating status there.
# ** If on EC2, shutdown instance. Otherwise get charged for potentially many days/weeks idle time with no alerts **
# If it's evening, SLEEP.
# It can take a few days for CRAN's checks to run. If any issues arise, backport locally. Resubmit the same even version to CRAN.
# CRAN's first check is automatic and usually received within an hour. WAIT FOR THAT EMAIL.
# When CRAN's email contains "Pretest results OK pending a manual inspection" (or similar), or if not and it is known why not and ok, then bump dev.

###### Bump dev for NON-PATCH RELEASE
# 0. Close milestone to prevent new issues being tagged with it. The final 'release checks' issue can be left open in a closed milestone.
# 1. Check that 'git status' shows 4 files in modified and uncommitted state: DESCRIPTION, NEWS.md, init.c and this .dev/CRAN_Release.cmd
# 2. Bump minor version in DESCRIPTION to next odd number. Note that DESCRIPTION was in edited and uncommitted state so even number never appears in git.

The last line is what I'm worried about (if we still care to follow these instructions). The "even number never appears in git" means that we should not push any commits with version 1.15.0 to master branch, and instead master should go from 1.14.99 to 1.15.99 -- does that make sense? Also it says below that the specific commit message we should use:

# 8. Push to master with this consistent commit message: "1.14.8 on CRAN. Bump to 1.14.10"

so if you agree, let's close this PR and instead merge #5936 ?

@jangorecki
Copy link
Member

The other PR looks better but there are good updates to release procedure here in this PR that make sense to include as well, but probably better not in version bump PR anyway

@jangorecki jangorecki deleted the release_changes_1.15 branch February 17, 2024 07:42
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.

None yet

5 participants