Add command to prepare GBM release #158

derekblank · 2023-10-11T06:30:24Z

Adds prepare function for Gutenberg Mobile:

Add command to prepare GBM release #152

The intent of the Gutenberg Mobile prepare command:

Update the GB reference to the release tag
Prepare the bundle
Update the release notes
Create the release PR

derekblank · 2023-10-11T06:36:46Z

@jhnstn This is currently a WIP based on the previous version of gbm-cli/cli/pkg/gbm/gbm.go.

There are still a few items to address and get feedback on:

The structure of the original gbm-cli branch and the branch the current trunk (with the Gutenberg prepare command) are a bit different. Does the directory structure proposed here make sense, or should we move where we want to place this Gutenberg Mobile prepare command?
In gbm.go in this PR, I started updating some of the git methods from using go-git to using our own git.go methods. We already discussed not using go-git library due to some of its limitations (which I agree is a good idea), but wanted to check on the methods that this PR adds in git.go. Some of them still need some updating, particularly with the pointers.

jhnstn · 2023-10-11T19:10:51Z

cli/pkg/git/git.go

@@ -14,6 +16,30 @@ func Clone(repo, dir string, shallow bool) error {
 	return cmd("clone", repo)
 }

+func CloneGBM(dir string, pr gh.PullRequest, verbose bool) (*g.Repository, error) {


I'm not sure about putting something this GBM specific in the git package. Feels like it belongs in gbm/gbm.go

Not a blocker but something to consider as a refactor.

derekblank · 2023-10-12T05:47:03Z

@jhnstn Updated the PR with the output of our pairing session and then continued the rest of the steps to create the PR based on (gb.go and the previous release-automation script). There may be some tweaks needed to gbm.go as you work it into a release command, but otherwise marking this release pkg PR as read to review. Feel free to make any tweaks on this branch as well, or we can merge and iterate from there to keep code consolidated more quickly.

derekblank · 2023-10-13T04:45:39Z

@jhnstn I merged the prepare subcommands from trunk, and wired up the GBM prepare command to call CreateGbmPR, e.g.:

GBM_WORDPRESS_ORG=derekblank go run main.go release prepare gbm v1.0.6

It's invoking the CreateGbmPR command correctly, but there's still an issue with the tmp directory. Perhaps it's how we're passing tempDir here, or setting the gbmDir here.

inludes git, npm, and bundler

derekblank · 2023-10-17T04:55:52Z

@jhnstn I believe the issue with nothing to commit, working tree clean was that the remote origin and upstream branch was not being set in git. I added git interfaces to add these to the GBM prepare command, but the syntax might need some tweaks to get it right.

jhnstn · 2023-10-17T19:43:55Z

@derekblank I got this working. The PR body is empty but going to merge as is

cli/pkg/git/git.go

cli/pkg/gbm/gbm.go

cli/pkg/release/gbm.go

* Add base gbm prepare command * Add CloneGBM function to git pkg * Add git submodule utility functions * Update gbm.go * Add Submodule to git client * Update gbm.go steps * Add UpdateReleaseNotes util * Add Bundle exec command * Add GBM PR body template * Add steps to preview and create Gutenberg Mobile PR * Add code comments to gbm prepare command * Call CreateGbmPR from gbm release subcommand * Add shell package for shell based commands inludes git, npm, and bundler * Update gb.go to use the new shell commands * Update gbm release package * Add SetUpstreamTo and AddRemote git interfaces * Add remote and set upstream to GBM prepare command * Place the success message after verifying the PR was created * Add prepare cmd utils * Update SetUpstreamTo signature * Reorder some events and clean up logging messages * Add a cmd utils package * Move temp directory helpers to the cmd utils * Deprecate the console error functions * Use the cmd utils to exit on error * Fix how the deferred function is handling cleanup * Add git submodule utility functions * Add Submodule to git client * Call CreateGbmPR from gbm release subcommand * Update gb.go to use the new shell commands * Update exit on prepare gbm command --------- Co-authored-by: jhnstn <[email protected]> Co-authored-by: Jason Johnston <[email protected]>

* Add yaml processor * Fix mod files * Pass pr by value to preview function * Add new subcommand for target repos * Add a cmd utils package * Move temp directory helpers to the cmd utils * Deprecate the console error functions * Use the cmd utils to exit on error * Fix how the deferred function is handling cleanup * Add command to prepare GBM release (#158) * Add base gbm prepare command * Add CloneGBM function to git pkg * Add git submodule utility functions * Update gbm.go * Add Submodule to git client * Update gbm.go steps * Add UpdateReleaseNotes util * Add Bundle exec command * Add GBM PR body template * Add steps to preview and create Gutenberg Mobile PR * Add code comments to gbm prepare command * Call CreateGbmPR from gbm release subcommand * Add shell package for shell based commands inludes git, npm, and bundler * Update gb.go to use the new shell commands * Update gbm release package * Add SetUpstreamTo and AddRemote git interfaces * Add remote and set upstream to GBM prepare command * Place the success message after verifying the PR was created * Add prepare cmd utils * Update SetUpstreamTo signature * Reorder some events and clean up logging messages * Add a cmd utils package * Move temp directory helpers to the cmd utils * Deprecate the console error functions * Use the cmd utils to exit on error * Fix how the deferred function is handling cleanup * Add git submodule utility functions * Add Submodule to git client * Call CreateGbmPR from gbm release subcommand * Update gb.go to use the new shell commands * Update exit on prepare gbm command --------- Co-authored-by: jhnstn <[email protected]> Co-authored-by: Jason Johnston <[email protected]> * Make shell command interfaces public Also rename factory functions to add clarity * Work in progress * add dir to the try exec command * Update yq test to handle dots in values * Update integration package to return the pr * Fill in the create pr flows to the integrate cmd * Update integrate to use the new exit flow * Get Android PR working * Add keep flag to keep the temp directory around after the command * Add cleaner factory function * Add rake to the shell package * get integrate working for ios --------- Co-authored-by: Derek Blank <[email protected]>

* Add yaml processor * Fix mod files * Pass pr by value to preview function * Add new subcommand for target repos * Add a cmd utils package * Move temp directory helpers to the cmd utils * Deprecate the console error functions * Use the cmd utils to exit on error * Fix how the deferred function is handling cleanup * Add command to prepare GBM release (#158) * Add base gbm prepare command * Add CloneGBM function to git pkg * Add git submodule utility functions * Update gbm.go * Add Submodule to git client * Update gbm.go steps * Add UpdateReleaseNotes util * Add Bundle exec command * Add GBM PR body template * Add steps to preview and create Gutenberg Mobile PR * Add code comments to gbm prepare command * Call CreateGbmPR from gbm release subcommand * Add shell package for shell based commands inludes git, npm, and bundler * Update gb.go to use the new shell commands * Update gbm release package * Add SetUpstreamTo and AddRemote git interfaces * Add remote and set upstream to GBM prepare command * Place the success message after verifying the PR was created * Add prepare cmd utils * Update SetUpstreamTo signature * Reorder some events and clean up logging messages * Add a cmd utils package * Move temp directory helpers to the cmd utils * Deprecate the console error functions * Use the cmd utils to exit on error * Fix how the deferred function is handling cleanup * Add git submodule utility functions * Add Submodule to git client * Call CreateGbmPR from gbm release subcommand * Update gb.go to use the new shell commands * Update exit on prepare gbm command --------- Co-authored-by: jhnstn <[email protected]> Co-authored-by: Jason Johnston <[email protected]> * Make shell command interfaces public Also rename factory functions to add clarity * Work in progress * add dir to the try exec command * Update yq test to handle dots in values * Update integration package to return the pr * Fill in the create pr flows to the integrate cmd * Update integrate to use the new exit flow * Get Android PR working * Add keep flag to keep the temp directory around after the command * Add cleaner factory function * Add rake to the shell package * get integrate working for ios * Add workspace package for managing the temp directories * update commands to use the new workspace package * Refactor workspace into an interface --------- Co-authored-by: Derek Blank <[email protected]>

derekblank added 4 commits October 11, 2023 14:04

Add base gbm prepare command

c7e7dd4

Add CloneGBM function to git pkg

db9339b

Add git submodule utility functions

f3bbb6f

Update gbm.go

606055c

derekblank requested a review from jhnstn October 11, 2023 06:30

jhnstn reviewed Oct 11, 2023

View reviewed changes

derekblank added 8 commits October 12, 2023 09:39

Merge trunk

0973f88

Add Submodule to git client

485270c

Update gbm.go steps

d64997c

Add UpdateReleaseNotes util

e00416d

Add Bundle exec command

3e4d3cc

Add GBM PR body template

33ef3ca

Add steps to preview and create Gutenberg Mobile PR

368b70c

Add code comments to gbm prepare command

f90bd9c

derekblank marked this pull request as ready for review October 12, 2023 05:41

derekblank added enhancement New feature or request [Feature] CLI labels Oct 12, 2023

derekblank mentioned this pull request Oct 13, 2023

Add command to prepare GBM release #152

Closed

Merge remote-tracking branch 'origin' into cli/gbm-prepare

03fa629

derekblank mentioned this pull request Oct 13, 2023

[CLI] Add new subcommand for target repos #166

Merged

derekblank added 2 commits October 13, 2023 14:03

Merge remote-tracking branch 'origin' into cli/gbm-prepare

e9ee191

Call CreateGbmPR from gbm release subcommand

ba0a457

jhnstn and others added 5 commits October 13, 2023 15:05

Add shell package for shell based commands

c7318b0

inludes git, npm, and bundler

Update gb.go to use the new shell commands

4f4fc6b

Update gbm release package

0a74d43

Add SetUpstreamTo and AddRemote git interfaces

c5961fa

Add remote and set upstream to GBM prepare command

9c0a1a1

jhnstn and others added 15 commits October 17, 2023 14:39

Place the success message after verifying the PR was created

f5fa9f6

Add prepare cmd utils

32d354d

Update SetUpstreamTo signature

41a304e

Reorder some events and clean up logging messages

0afefb1

Add a cmd utils package

8710371

Move temp directory helpers to the cmd utils

254ae11

Deprecate the console error functions

8b705b5

Use the cmd utils to exit on error

53b59f2

Fix how the deferred function is handling cleanup

7da8dbb

Add git submodule utility functions

73c3499

Add Submodule to git client

8a6485f

Call CreateGbmPR from gbm release subcommand

b449907

Update gb.go to use the new shell commands

a9c1530

Update exit on prepare gbm command

3764813

Merge branch 'trunk' into cli/gbm-prepare

ac2d874

jhnstn enabled auto-merge (squash) October 17, 2023 19:44

jhnstn approved these changes Oct 17, 2023

View reviewed changes

jhnstn merged commit bc68e6b into trunk Oct 17, 2023
1 check passed

jhnstn deleted the cli/gbm-prepare branch October 17, 2023 19:44

jhnstn mentioned this pull request Oct 17, 2023

Pass pr by value to preview function #175

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add command to prepare GBM release #158

Add command to prepare GBM release #158

derekblank commented Oct 11, 2023

derekblank commented Oct 11, 2023 •

edited

Loading

jhnstn Oct 11, 2023

derekblank commented Oct 12, 2023

derekblank commented Oct 13, 2023

derekblank commented Oct 17, 2023

jhnstn commented Oct 17, 2023

Add command to prepare GBM release #158

Add command to prepare GBM release #158

Conversation

derekblank commented Oct 11, 2023

derekblank commented Oct 11, 2023 • edited Loading

jhnstn Oct 11, 2023

Choose a reason for hiding this comment

derekblank commented Oct 12, 2023

derekblank commented Oct 13, 2023

derekblank commented Oct 17, 2023

jhnstn commented Oct 17, 2023

derekblank commented Oct 11, 2023 •

edited

Loading