Skip to content

Commit

Permalink
Use no_change() instead of bumping, fewer steps
Browse files Browse the repository at this point in the history
  • Loading branch information
@krlmlr
krlmlr committed Oct 22, 2023
1 parent 5aafcc1 commit 3c1ac46
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 43 deletions.
27 changes: 9 additions & 18 deletions R/auto.R
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,11 +75,15 @@ init_release_impl <- function(which, force) {
# Checking if it's an orphan branch: https://github.com/r-lib/gert/issues/139
stopifnot(get_branch_name() != "HEAD")

# check PAT scopes for PR for early abort
if (!nzchar(Sys.getenv("FLEDGE_TEST_NOGH"))) check_gh_pat("repo")
# Do we need bump_version() first?
if (!no_change()) {
cli_abort(c(
"Aborting release process because not all changes were recorded.",
i = "Run {.run fledge::bump_version()}, then rerun {.run fledge::init_release()}"
))
}

fledgeling <- read_fledgling()

new_version <- fledge_guess_version(fledgeling[["version"]], which)

if (!force) {
Expand All @@ -93,22 +97,9 @@ init_release_impl <- function(which, force) {
# Begin extension points
# End extension points

if (fledge_chatty()) cli_h1("1. Wrapping up development")

# Bump dev if needed, bail out if bumped
new_fledgeling <- bump_version_impl(fledgeling, "dev", no_change_behavior = "noop")
if (!identical(new_fledgeling, fledgeling)) {
cli_abort(c(
# FIXME: Copilot-generated
"Aborting release process because the version was bumped during the process.",
i = "Rerun {.run fledge::init_release()}"
))
}
rm(new_fledgeling)

# Don't bump here, want to be compatible with merge queues at some point

if (fledge_chatty()) cli_h1("2. Creating a release branch and getting ready")
if (fledge_chatty()) cli_h1("1. Creating a release branch and getting ready")

# regroup dev news
fledgeling <- merge_dev_news(fledgeling, new_version)
Expand All @@ -128,7 +119,7 @@ init_release_impl <- function(which, force) {
edit_cran_comments()

if (fledge_chatty()) {
cli_h1("3. User Action Items")
cli_h1("2. User Action Items")
cli_div(theme = list(ul = list(color = "magenta")))
cli_ul("Run {.run devtools::check_win_devel()}.")
cli_ul("Run {.run rhub::check_for_cran()}.")
Expand Down
35 changes: 10 additions & 25 deletions tests/testthat/_snaps/auto.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,15 +29,12 @@
+-----------------+
Message
-- 1. Wrapping up development --------------------------------------------------
i No change since last version.
-- 2. Creating a release branch and getting ready ------------------------------
-- 1. Creating a release branch and getting ready ------------------------------
> Creating branch cran-0.0.1.
> Switching to branch cran-0.0.1.
> Committing changes.
-- 3. User Action Items --------------------------------------------------------
-- 2. User Action Items --------------------------------------------------------
* Run `devtools::check_win_devel()`.
* Run `rhub::check_for_cran()`.
* Run `urlchecker::url_update()`.
Expand Down Expand Up @@ -68,15 +65,12 @@
+-----------------+
Message
-- 1. Wrapping up development --------------------------------------------------
i No change since last version.
-- 2. Creating a release branch and getting ready ------------------------------
-- 1. Creating a release branch and getting ready ------------------------------
> Creating branch cran-0.0.1.
> Switching to branch cran-0.0.1.
> Committing changes.
-- 3. User Action Items --------------------------------------------------------
-- 2. User Action Items --------------------------------------------------------
* Run `devtools::check_win_devel()`.
* Run `rhub::check_for_cran()`.
* Run `urlchecker::url_update()`.
Expand Down Expand Up @@ -130,15 +124,12 @@
+-----------------+
Message
-- 1. Wrapping up development --------------------------------------------------
i No change since last version.
-- 2. Creating a release branch and getting ready ------------------------------
-- 1. Creating a release branch and getting ready ------------------------------
> Creating branch cran-0.0.1.
> Switching to branch cran-0.0.1.
> Committing changes.
-- 3. User Action Items --------------------------------------------------------
-- 2. User Action Items --------------------------------------------------------
* Run `devtools::check_win_devel()`.
* Run `rhub::check_for_cran()`.
* Run `urlchecker::url_update()`.
Expand Down Expand Up @@ -234,15 +225,12 @@
+-----------------+
Message
-- 1. Wrapping up development --------------------------------------------------
i No change since last version.
-- 2. Creating a release branch and getting ready ------------------------------
-- 1. Creating a release branch and getting ready ------------------------------
> Creating branch cran-0.1.0.
> Switching to branch cran-0.1.0.
> Committing changes.
-- 3. User Action Items --------------------------------------------------------
-- 2. User Action Items --------------------------------------------------------
* Run `devtools::check_win_devel()`.
* Run `rhub::check_for_cran()`.
* Run `urlchecker::url_update()`.
Expand Down Expand Up @@ -356,15 +344,12 @@
+-----------------+
Message
-- 1. Wrapping up development --------------------------------------------------
i No change since last version.
-- 2. Creating a release branch and getting ready ------------------------------
-- 1. Creating a release branch and getting ready ------------------------------
> Creating branch cran-0.0.1.
> Switching to branch cran-0.0.1.
> Committing changes.
-- 3. User Action Items --------------------------------------------------------
-- 2. User Action Items --------------------------------------------------------
* Run `devtools::check_win_devel()`.
* Run `rhub::check_for_cran()`.
* Run `urlchecker::url_update()`.
Expand Down

0 comments on commit 3c1ac46

Please sign in to comment.