Tag and check for release candidates #61

pat-s · 2020-10-02T14:01:21Z

fixes #60

Creates RC tags in release()
Aborts the build if the build is running in "state = release" and the sha of the most recent commit == sha of the most recent tag && "-rc" is found in the most recent tag name
Deletes all RC tags in post_release()
Uses gh (if avail) to merge a PR instead of merging the branch.

ToDo

Enumerate RC tags because we can have multiple rejections

Merge branch 'master' into prerelease-state # Conflicts: # DESCRIPTION # NAMESPACE # R/bump-version.R # R/finalize-version.R # R/import.R

codecov · 2020-10-02T14:32:55Z

Codecov Report

Merging #61 into prerelease-state will not change coverage.
The diff coverage is 0.00%.

@@                Coverage Diff                @@
##           prerelease-state     #61    +/-   ##
=================================================
  Coverage              0.00%   0.00%            
=================================================
  Files                    17      21     +4     
  Lines                   184     531   +347     
=================================================
- Misses                  184     531   +347

Impacted Files	Coverage Δ
R/api-bump-version.R	`0.00% <0.00%> (ø)`
R/api-finalize-version.R	`0.00% <0.00%> (ø)`
R/api-tag-version.R	`0.00% <0.00%> (ø)`
R/auto.R	`0.00% <0.00%> (ø)`
R/bump-version.R	`0.00% <0.00%> (ø)`
R/commit-version.R	`0.00% <0.00%> (ø)`
R/finalize-version.R	`0.00% <0.00%> (ø)`
R/gh-helpers.R	`0.00% <0.00%> (ø)`
R/state.R	`0.00% <0.00%> (ø)`
R/tag-version.R	`0.00% <0.00%> (ø)`
... and 8 more

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 19e1927...dedc3cf. Read the comment docs.

pat-s · 2020-10-06T13:27:19Z

@krlmlr Successfully used this branch to release mlr v2.18.0 including to failed attempt (which triggered two "-rc" tags).

krlmlr

Thanks. Can you please isolate the changes so that they apply directly to the f-27-automate branch, and open a new PR? I'm not ready to commit to state management, RC tagging is useful in itself.

krlmlr · 2021-04-18T07:25:00Z

R/auto.R

+  # FIXME: clean up mess
+
+  # check if gh is avail
+  is_gh_avail <- suppressWarnings(try(system2("gh", stdout = FALSE, stderr = FALSE), silent = TRUE))


I'd rather discuss this change in a separate PR.

Separate = third.

pat-s · 2021-04-18T09:55:18Z

R/auto.R

@@ -64,10 +64,12 @@ pre_release_impl <- function(which, force) {
  # push main branch, bump to devel version and push again
  push_to_new(remote_name, force)
  switch_branch(main_branch)
+  push_head(main_branch)


not sure if these two push_head() calls are still needed - guess we need to check in action

pat-s · 2021-04-18T10:03:36Z

Rebased and stripped the diff, not sure if I removed something important though.

I'd just check how it behaves in practice then but ofc this is your decision in the end.

krlmlr · 2021-04-18T16:16:12Z

/style

Merge back PR target branch

krlmlr · 2021-04-18T17:42:23Z

/merge

pat-s · 2021-06-01T10:23:59Z

Did your latest comment have the intention to merge this PR?

krlmlr · 2021-06-04T01:03:20Z

No.

krlmlr · 2021-06-04T01:04:10Z

/merge

krlmlr · 2021-06-04T01:09:23Z

I'm experimenting with a flow that allows seamless integration of the target branch into the source branch. I do wonder why GitHub hasn't implemented this yet. Anyway, this is now available through the "/ merge" command in pull requests. Because GHA won't run checks when I push directly, I open a PR instead so that the user can merge manually and trigger checks in the target branch.

CC @wael-sadek.

pat-s · 2021-12-11T16:51:25Z

@krlmlr How do you want to proceed here? I assume closing?

krlmlr · 2021-12-12T11:13:17Z

I'm open to discussing release candidate tags. About to merge that long-running PR, this will probably close this PR.

pat-s added 15 commits August 24, 2020 17:04

add check_pre_release_state()

8bc85eb

use ui_code()

4cef4b0

style

d79dc6f

ensure desc object is present

9566c27

return modified R6 desc object

215d93c

refactor check_release_state()

4d91e6e

add unleash.R

5662a5b

merge master

6ea0066

Merge branch 'master' into prerelease-state # Conflicts: # DESCRIPTION # NAMESPACE # R/bump-version.R # R/finalize-version.R # R/import.R

small fixes

a972ec9

fix update_version.R

712b78a

fixes after first release try

5c40a20

add tag_release_candidate()

360b95a

add check_for_rc()

e595469

tag RC in release()

8571356

add delete_release_candidate_tags()

9f38eec

pat-s requested a review from krlmlr October 2, 2020 14:01

pat-s added 5 commits October 2, 2020 16:09

push RC tag

951e13f

minor

1a2ead5

document

736e4f5

re-add bump_version_to_dev_with_force()

eb66dbb

re-add bump_version_to_dev_with_force()

43d5a1b

pat-s added 6 commits October 2, 2020 16:36

Merge branch 'f-27-automate' into prerelease-state

19e1927

new check_existing_rc(): account for multiple release candidates

11c8608

fix deleting tags

0528d62

post_release(): add gh functionality, optimize

dc08bac

update check_release_state()

ccf740c

Merge branch 'prerelease-state' into tag_release_candidate

5b73303

upd namespace

dedc3cf

krlmlr requested changes Apr 18, 2021

View reviewed changes

krlmlr marked this pull request as draft April 18, 2021 07:26

pat-s changed the base branch from prerelease-state to f-27-automate April 18, 2021 09:26

pat-s mentioned this pull request Apr 18, 2021

Consider using gh for GitHub PR actions #63

Closed

pat-s added 5 commits April 18, 2021 11:38

merge f-27-automate

2710925

git2r -> gert

64f593d

clean diff

729bf02

more diff cleanup

f82afbf

clean

06aab09

pat-s commented Apr 18, 2021

View reviewed changes

fix build

f38f670

pat-s requested a review from krlmlr April 18, 2021 10:03

pat-s marked this pull request as ready for review April 18, 2021 10:03

Style

10b083d

This was referenced Apr 18, 2021

Merge back PR target branch #88

Closed

Merge back PR target branch #89

Closed

Merge back PR target branch #90

Merged

Merge pull request #90 from cynkra/f-27-automate

c1e1f66

Merge back PR target branch

github-actions bot mentioned this pull request Jun 4, 2021

Merge back PR target branch #100

Merged

Merge pull request #100 from cynkra/f-27-automate

6d79386

Base automatically changed from f-27-automate to main February 22, 2022 10:13

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Tag and check for release candidates #61

Tag and check for release candidates #61

pat-s commented Oct 2, 2020 •

edited

Loading

codecov bot commented Oct 2, 2020 •

edited

Loading

pat-s commented Oct 6, 2020

krlmlr left a comment

krlmlr Apr 18, 2021

krlmlr Apr 18, 2021

pat-s Apr 18, 2021

pat-s commented Apr 18, 2021

krlmlr commented Apr 18, 2021

krlmlr commented Apr 18, 2021

pat-s commented Jun 1, 2021

krlmlr commented Jun 4, 2021

krlmlr commented Jun 4, 2021

krlmlr commented Jun 4, 2021

pat-s commented Dec 11, 2021

krlmlr commented Dec 12, 2021

Tag and check for release candidates #61

Are you sure you want to change the base?

Tag and check for release candidates #61

Conversation

pat-s commented Oct 2, 2020 • edited Loading

ToDo

codecov bot commented Oct 2, 2020 • edited Loading

Codecov Report

pat-s commented Oct 6, 2020

krlmlr left a comment

Choose a reason for hiding this comment

krlmlr Apr 18, 2021

Choose a reason for hiding this comment

krlmlr Apr 18, 2021

Choose a reason for hiding this comment

pat-s Apr 18, 2021

Choose a reason for hiding this comment

pat-s commented Apr 18, 2021

krlmlr commented Apr 18, 2021

krlmlr commented Apr 18, 2021

pat-s commented Jun 1, 2021

krlmlr commented Jun 4, 2021

krlmlr commented Jun 4, 2021

krlmlr commented Jun 4, 2021

pat-s commented Dec 11, 2021

krlmlr commented Dec 12, 2021

pat-s commented Oct 2, 2020 •

edited

Loading

codecov bot commented Oct 2, 2020 •

edited

Loading