From 8f0f762d92323ac3753479c11a11453d6ffabb6c Mon Sep 17 00:00:00 2001 From: jhnstn Date: Mon, 6 Nov 2023 12:02:55 -0500 Subject: [PATCH 1/3] Fix project path --- cli/cmd/release/integrate.go | 12 ++++++------ cli/cmd/release/prepare/all.go | 6 +++--- cli/cmd/release/prepare/gb.go | 6 +++--- cli/cmd/release/prepare/gbm.go | 6 +++--- cli/cmd/release/prepare/root.go | 14 +++++++------- cli/cmd/release/root.go | 4 ++-- cli/cmd/release/status.go | 12 ++++++------ cli/cmd/render/aztec.go | 2 +- cli/cmd/render/checklist.go | 8 ++++---- cli/cmd/render/root.go | 2 +- cli/cmd/render/utils.go | 2 +- cli/cmd/root.go | 6 +++--- cli/cmd/utils/utils.go | 4 ++-- cli/cmd/workspace/workspace.go | 2 +- cli/go.mod | 2 +- cli/main.go | 4 ++-- cli/pkg/gbm/builds.go | 2 +- cli/pkg/gbm/search.go | 4 ++-- cli/pkg/gh/gh.go | 6 +++--- cli/pkg/release/gb.go | 12 ++++++------ cli/pkg/release/gbm.go | 16 ++++++++-------- cli/pkg/release/integrate/android.go | 12 ++++++------ cli/pkg/release/integrate/integrate.go | 12 ++++++------ cli/pkg/release/integrate/ios.go | 14 +++++++------- cli/pkg/release/main.go | 4 ++-- cli/pkg/release/search.go | 4 ++-- cli/pkg/release/utils.go | 8 ++++---- cli/pkg/shell/git.go | 2 +- cli/pkg/utils/utils.go | 2 +- 29 files changed, 95 insertions(+), 95 deletions(-) diff --git a/cli/cmd/release/integrate.go b/cli/cmd/release/integrate.go index 2cf9b881..97708c86 100644 --- a/cli/cmd/release/integrate.go +++ b/cli/cmd/release/integrate.go @@ -7,12 +7,12 @@ import ( "path/filepath" "github.com/spf13/cobra" - "github.com/wordpress-mobile/gbm-cli/cmd/utils" - wp "github.com/wordpress-mobile/gbm-cli/cmd/workspace" - "github.com/wordpress-mobile/gbm-cli/pkg/console" - "github.com/wordpress-mobile/gbm-cli/pkg/gh" - "github.com/wordpress-mobile/gbm-cli/pkg/release" - "github.com/wordpress-mobile/gbm-cli/pkg/release/integrate" + "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/cli/cmd/utils" + wp "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/cli/cmd/workspace" + "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/cli/pkg/console" + "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/cli/pkg/gh" + "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/cli/pkg/release" + "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/cli/pkg/release/integrate" ) var android, ios, both bool diff --git a/cli/cmd/release/prepare/all.go b/cli/cmd/release/prepare/all.go index 5f49968f..d0adbb16 100644 --- a/cli/cmd/release/prepare/all.go +++ b/cli/cmd/release/prepare/all.go @@ -5,9 +5,9 @@ import ( "path/filepath" "github.com/spf13/cobra" - "github.com/wordpress-mobile/gbm-cli/pkg/console" - "github.com/wordpress-mobile/gbm-cli/pkg/gh" - "github.com/wordpress-mobile/gbm-cli/pkg/release" + "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/cli/pkg/console" + "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/cli/pkg/gh" + "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/cli/pkg/release" ) var allCmd = &cobra.Command{ diff --git a/cli/cmd/release/prepare/gb.go b/cli/cmd/release/prepare/gb.go index d9dec65e..e2b60ec9 100644 --- a/cli/cmd/release/prepare/gb.go +++ b/cli/cmd/release/prepare/gb.go @@ -2,9 +2,9 @@ package prepare import ( "github.com/spf13/cobra" - "github.com/wordpress-mobile/gbm-cli/pkg/console" - "github.com/wordpress-mobile/gbm-cli/pkg/gh" - "github.com/wordpress-mobile/gbm-cli/pkg/release" + "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/cli/pkg/console" + "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/cli/pkg/gh" + "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/cli/pkg/release" ) var gbCmd = &cobra.Command{ diff --git a/cli/cmd/release/prepare/gbm.go b/cli/cmd/release/prepare/gbm.go index 158f619e..c2b5d6ac 100644 --- a/cli/cmd/release/prepare/gbm.go +++ b/cli/cmd/release/prepare/gbm.go @@ -2,9 +2,9 @@ package prepare import ( "github.com/spf13/cobra" - "github.com/wordpress-mobile/gbm-cli/pkg/console" - "github.com/wordpress-mobile/gbm-cli/pkg/gh" - "github.com/wordpress-mobile/gbm-cli/pkg/release" + "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/cli/pkg/console" + "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/cli/pkg/gh" + "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/cli/pkg/release" ) var gbmCmd = &cobra.Command{ diff --git a/cli/cmd/release/prepare/root.go b/cli/cmd/release/prepare/root.go index f688a6f6..c488ab6b 100644 --- a/cli/cmd/release/prepare/root.go +++ b/cli/cmd/release/prepare/root.go @@ -4,13 +4,13 @@ import ( "errors" "github.com/spf13/cobra" - "github.com/wordpress-mobile/gbm-cli/cmd/utils" - wp "github.com/wordpress-mobile/gbm-cli/cmd/workspace" - "github.com/wordpress-mobile/gbm-cli/pkg/console" - "github.com/wordpress-mobile/gbm-cli/pkg/gbm" - "github.com/wordpress-mobile/gbm-cli/pkg/gh" - "github.com/wordpress-mobile/gbm-cli/pkg/release" - "github.com/wordpress-mobile/gbm-cli/pkg/semver" + "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/cli/cmd/utils" + wp "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/cli/cmd/workspace" + "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/cli/pkg/console" + "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/cli/pkg/gbm" + "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/cli/pkg/gh" + "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/cli/pkg/release" + "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/cli/pkg/semver" ) var exitIfError func(error, int) diff --git a/cli/cmd/release/root.go b/cli/cmd/release/root.go index 5a649214..d0e271d8 100644 --- a/cli/cmd/release/root.go +++ b/cli/cmd/release/root.go @@ -2,8 +2,8 @@ package release import ( "github.com/spf13/cobra" - "github.com/wordpress-mobile/gbm-cli/cmd/release/prepare" - wp "github.com/wordpress-mobile/gbm-cli/cmd/workspace" + "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/cli/cmd/release/prepare" + wp "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/cli/cmd/workspace" ) var exitIfError func(error, int) diff --git a/cli/cmd/release/status.go b/cli/cmd/release/status.go index 126bf039..dea73dfc 100644 --- a/cli/cmd/release/status.go +++ b/cli/cmd/release/status.go @@ -3,12 +3,12 @@ package release import ( "github.com/fatih/color" "github.com/spf13/cobra" - "github.com/wordpress-mobile/gbm-cli/cmd/utils" - "github.com/wordpress-mobile/gbm-cli/pkg/console" - "github.com/wordpress-mobile/gbm-cli/pkg/gbm" - "github.com/wordpress-mobile/gbm-cli/pkg/gh" - "github.com/wordpress-mobile/gbm-cli/pkg/release" - "github.com/wordpress-mobile/gbm-cli/pkg/repo" + "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/cli/cmd/utils" + "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/cli/pkg/console" + "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/cli/pkg/gbm" + "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/cli/pkg/gh" + "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/cli/pkg/release" + "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/cli/pkg/repo" ) var StatusCmd = &cobra.Command{ diff --git a/cli/cmd/render/aztec.go b/cli/cmd/render/aztec.go index 304eb952..c070a437 100644 --- a/cli/cmd/render/aztec.go +++ b/cli/cmd/render/aztec.go @@ -2,7 +2,7 @@ package render import ( "github.com/spf13/cobra" - "github.com/wordpress-mobile/gbm-cli/pkg/console" + "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/cli/pkg/console" ) var AztecCmd = &cobra.Command{ diff --git a/cli/cmd/render/checklist.go b/cli/cmd/render/checklist.go index 322f39cd..a73fba9c 100644 --- a/cli/cmd/render/checklist.go +++ b/cli/cmd/render/checklist.go @@ -6,10 +6,10 @@ import ( "github.com/spf13/cobra" - "github.com/wordpress-mobile/gbm-cli/pkg/console" - "github.com/wordpress-mobile/gbm-cli/pkg/gbm" - "github.com/wordpress-mobile/gbm-cli/pkg/render" - "github.com/wordpress-mobile/gbm-cli/pkg/semver" + "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/cli/pkg/console" + "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/cli/pkg/gbm" + "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/cli/pkg/render" + "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/cli/pkg/semver" ) var version string diff --git a/cli/cmd/render/root.go b/cli/cmd/render/root.go index feb76a9d..8ff609df 100644 --- a/cli/cmd/render/root.go +++ b/cli/cmd/render/root.go @@ -4,7 +4,7 @@ import ( "os" "github.com/spf13/cobra" - "github.com/wordpress-mobile/gbm-cli/cmd/utils" + "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/cli/cmd/utils" ) var writeToClipboard bool diff --git a/cli/cmd/render/utils.go b/cli/cmd/render/utils.go index 687d5796..699b1925 100644 --- a/cli/cmd/render/utils.go +++ b/cli/cmd/render/utils.go @@ -4,7 +4,7 @@ import ( "fmt" "time" - "github.com/wordpress-mobile/gbm-cli/pkg/render" + "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/cli/pkg/render" ) func renderAztecSteps(conditional bool) (string, error) { diff --git a/cli/cmd/root.go b/cli/cmd/root.go index 06886c85..fda378d7 100644 --- a/cli/cmd/root.go +++ b/cli/cmd/root.go @@ -2,9 +2,9 @@ package cmd import ( "github.com/spf13/cobra" - "github.com/wordpress-mobile/gbm-cli/cmd/release" - "github.com/wordpress-mobile/gbm-cli/cmd/render" - "github.com/wordpress-mobile/gbm-cli/pkg/console" + "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/cli/cmd/release" + "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/cli/cmd/render" + "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/cli/pkg/console" ) // rootCmd represents the base command when called without any subcommands diff --git a/cli/cmd/utils/utils.go b/cli/cmd/utils/utils.go index 9eedf173..b9632015 100644 --- a/cli/cmd/utils/utils.go +++ b/cli/cmd/utils/utils.go @@ -4,8 +4,8 @@ import ( "fmt" "os" - "github.com/wordpress-mobile/gbm-cli/pkg/console" - "github.com/wordpress-mobile/gbm-cli/pkg/semver" + "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/cli/pkg/console" + "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/cli/pkg/semver" ) func GetVersionArg(args []string) (semver.SemVer, error) { diff --git a/cli/cmd/workspace/workspace.go b/cli/cmd/workspace/workspace.go index f1b9ef95..fe1a6c8c 100644 --- a/cli/cmd/workspace/workspace.go +++ b/cli/cmd/workspace/workspace.go @@ -5,7 +5,7 @@ import ( "os/signal" "path" - "github.com/wordpress-mobile/gbm-cli/pkg/console" + "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/cli/pkg/console" ) type Workspace interface { diff --git a/cli/go.mod b/cli/go.mod index 744bd225..9298e829 100644 --- a/cli/go.mod +++ b/cli/go.mod @@ -1,4 +1,4 @@ -module github.com/wordpress-mobile/gbm-cli +module github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/cli go 1.21 diff --git a/cli/main.go b/cli/main.go index 7892369d..83d31cc9 100644 --- a/cli/main.go +++ b/cli/main.go @@ -6,8 +6,8 @@ package main import ( "embed" - "github.com/wordpress-mobile/gbm-cli/cmd" - "github.com/wordpress-mobile/gbm-cli/pkg/render" + "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/cli/cmd" + "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/cli/pkg/render" ) //go:embed templates/* diff --git a/cli/pkg/gbm/builds.go b/cli/pkg/gbm/builds.go index 5740363e..2a8678bf 100644 --- a/cli/pkg/gbm/builds.go +++ b/cli/pkg/gbm/builds.go @@ -1,7 +1,7 @@ package gbm import ( - "github.com/wordpress-mobile/gbm-cli/pkg/gh" + "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/cli/pkg/gh" ) func AndroidGbmBuildPublished(pr gh.PullRequest) (bool, error) { diff --git a/cli/pkg/gbm/search.go b/cli/pkg/gbm/search.go index 1199ff90..8c6f1736 100644 --- a/cli/pkg/gbm/search.go +++ b/cli/pkg/gbm/search.go @@ -3,8 +3,8 @@ package gbm import ( "strings" - "github.com/wordpress-mobile/gbm-cli/pkg/console" - "github.com/wordpress-mobile/gbm-cli/pkg/gh" + "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/cli/pkg/console" + "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/cli/pkg/gh" ) func FindGbmSyncedPrs(gbmPr gh.PullRequest, filters []gh.RepoFilter) ([]gh.SearchResult, error) { diff --git a/cli/pkg/gh/gh.go b/cli/pkg/gh/gh.go index fd0e4f79..016cdac8 100644 --- a/cli/pkg/gh/gh.go +++ b/cli/pkg/gh/gh.go @@ -11,9 +11,9 @@ import ( "github.com/cli/go-gh/v2/pkg/api" "github.com/fatih/color" - "github.com/wordpress-mobile/gbm-cli/pkg/console" - "github.com/wordpress-mobile/gbm-cli/pkg/repo" - "github.com/wordpress-mobile/gbm-cli/pkg/shell" + "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/cli/pkg/console" + "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/cli/pkg/repo" + "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/cli/pkg/shell" ) // Branch represents a GitHub branch API schema. diff --git a/cli/pkg/release/gb.go b/cli/pkg/release/gb.go index 6139a4c5..e644e15b 100644 --- a/cli/pkg/release/gb.go +++ b/cli/pkg/release/gb.go @@ -4,12 +4,12 @@ import ( "fmt" "path/filepath" - "github.com/wordpress-mobile/gbm-cli/pkg/console" - "github.com/wordpress-mobile/gbm-cli/pkg/gh" - "github.com/wordpress-mobile/gbm-cli/pkg/render" - "github.com/wordpress-mobile/gbm-cli/pkg/repo" - "github.com/wordpress-mobile/gbm-cli/pkg/shell" - "github.com/wordpress-mobile/gbm-cli/pkg/utils" + "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/cli/pkg/console" + "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/cli/pkg/gh" + "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/cli/pkg/render" + "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/cli/pkg/repo" + "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/cli/pkg/shell" + "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/cli/pkg/utils" ) func CreateGbPR(build Build) (gh.PullRequest, error) { diff --git a/cli/pkg/release/gbm.go b/cli/pkg/release/gbm.go index 85013c12..05bcfe45 100644 --- a/cli/pkg/release/gbm.go +++ b/cli/pkg/release/gbm.go @@ -7,14 +7,14 @@ import ( "os" "path/filepath" - "github.com/wordpress-mobile/gbm-cli/pkg/console" - "github.com/wordpress-mobile/gbm-cli/pkg/gbm" - "github.com/wordpress-mobile/gbm-cli/pkg/gh" - "github.com/wordpress-mobile/gbm-cli/pkg/shell" - "github.com/wordpress-mobile/gbm-cli/pkg/utils" - - "github.com/wordpress-mobile/gbm-cli/pkg/render" - "github.com/wordpress-mobile/gbm-cli/pkg/repo" + "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/cli/pkg/console" + "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/cli/pkg/gbm" + "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/cli/pkg/gh" + "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/cli/pkg/shell" + "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/cli/pkg/utils" + + "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/cli/pkg/render" + "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/cli/pkg/repo" ) func CreateGbmPR(build Build) (gh.PullRequest, error) { diff --git a/cli/pkg/release/integrate/android.go b/cli/pkg/release/integrate/android.go index 486d1a40..84886c69 100644 --- a/cli/pkg/release/integrate/android.go +++ b/cli/pkg/release/integrate/android.go @@ -7,13 +7,13 @@ import ( "path/filepath" "regexp" - "github.com/wordpress-mobile/gbm-cli/pkg/console" - "github.com/wordpress-mobile/gbm-cli/pkg/gbm" - "github.com/wordpress-mobile/gbm-cli/pkg/release" + "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/cli/pkg/console" + "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/cli/pkg/gbm" + "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/cli/pkg/release" - "github.com/wordpress-mobile/gbm-cli/pkg/gh" - "github.com/wordpress-mobile/gbm-cli/pkg/repo" - "github.com/wordpress-mobile/gbm-cli/pkg/shell" + "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/cli/pkg/gh" + "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/cli/pkg/repo" + "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/cli/pkg/shell" ) type AndroidIntegration struct { diff --git a/cli/pkg/release/integrate/integrate.go b/cli/pkg/release/integrate/integrate.go index 4c7e8134..9f89bf3b 100644 --- a/cli/pkg/release/integrate/integrate.go +++ b/cli/pkg/release/integrate/integrate.go @@ -4,12 +4,12 @@ import ( "errors" "fmt" - "github.com/wordpress-mobile/gbm-cli/pkg/console" - "github.com/wordpress-mobile/gbm-cli/pkg/gh" - "github.com/wordpress-mobile/gbm-cli/pkg/release" - "github.com/wordpress-mobile/gbm-cli/pkg/render" - "github.com/wordpress-mobile/gbm-cli/pkg/repo" - "github.com/wordpress-mobile/gbm-cli/pkg/shell" + "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/cli/pkg/console" + "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/cli/pkg/gh" + "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/cli/pkg/release" + "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/cli/pkg/render" + "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/cli/pkg/repo" + "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/cli/pkg/shell" ) type Integration interface { diff --git a/cli/pkg/release/integrate/ios.go b/cli/pkg/release/integrate/ios.go index 66ae01dd..38e8fca2 100644 --- a/cli/pkg/release/integrate/ios.go +++ b/cli/pkg/release/integrate/ios.go @@ -5,13 +5,13 @@ import ( "os" "path/filepath" - "github.com/wordpress-mobile/gbm-cli/pkg/console" - "github.com/wordpress-mobile/gbm-cli/pkg/gbm" - "github.com/wordpress-mobile/gbm-cli/pkg/gh" - "github.com/wordpress-mobile/gbm-cli/pkg/release" - "github.com/wordpress-mobile/gbm-cli/pkg/repo" - "github.com/wordpress-mobile/gbm-cli/pkg/shell" - "github.com/wordpress-mobile/gbm-cli/pkg/yq" + "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/cli/pkg/console" + "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/cli/pkg/gbm" + "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/cli/pkg/gh" + "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/cli/pkg/release" + "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/cli/pkg/repo" + "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/cli/pkg/shell" + "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/cli/pkg/yq" ) type IosIntegration struct { diff --git a/cli/pkg/release/main.go b/cli/pkg/release/main.go index 5a215267..ad250508 100644 --- a/cli/pkg/release/main.go +++ b/cli/pkg/release/main.go @@ -1,8 +1,8 @@ package release import ( - "github.com/wordpress-mobile/gbm-cli/pkg/gh" - "github.com/wordpress-mobile/gbm-cli/pkg/semver" + "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/cli/pkg/gh" + "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/cli/pkg/semver" ) type Build struct { diff --git a/cli/pkg/release/search.go b/cli/pkg/release/search.go index c1e064cb..811f2736 100644 --- a/cli/pkg/release/search.go +++ b/cli/pkg/release/search.go @@ -3,8 +3,8 @@ package release import ( "fmt" - "github.com/wordpress-mobile/gbm-cli/pkg/gh" - "github.com/wordpress-mobile/gbm-cli/pkg/repo" + "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/cli/pkg/gh" + "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/cli/pkg/repo" ) func FindGbReleasePr(version string) (gh.PullRequest, error) { diff --git a/cli/pkg/release/utils.go b/cli/pkg/release/utils.go index f4d44570..a60dac3f 100644 --- a/cli/pkg/release/utils.go +++ b/cli/pkg/release/utils.go @@ -11,10 +11,10 @@ import ( "strings" "github.com/fatih/color" - "github.com/wordpress-mobile/gbm-cli/pkg/console" - "github.com/wordpress-mobile/gbm-cli/pkg/gh" - "github.com/wordpress-mobile/gbm-cli/pkg/repo" - "github.com/wordpress-mobile/gbm-cli/pkg/shell" + "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/cli/pkg/console" + "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/cli/pkg/gh" + "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/cli/pkg/repo" + "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/cli/pkg/shell" ) func CollectReleaseChanges(version string, changelog, relnotes []byte) ([]ReleaseChanges, error) { diff --git a/cli/pkg/shell/git.go b/cli/pkg/shell/git.go index 64ef5328..9883c26f 100644 --- a/cli/pkg/shell/git.go +++ b/cli/pkg/shell/git.go @@ -5,7 +5,7 @@ import ( "os/exec" "strings" - "github.com/wordpress-mobile/gbm-cli/pkg/console" + "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/cli/pkg/console" ) type GitCmds interface { diff --git a/cli/pkg/utils/utils.go b/cli/pkg/utils/utils.go index c309e35a..632f2c39 100644 --- a/cli/pkg/utils/utils.go +++ b/cli/pkg/utils/utils.go @@ -4,7 +4,7 @@ import ( "os" "os/exec" - "github.com/wordpress-mobile/gbm-cli/pkg/console" + "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/cli/pkg/console" ) func SetupNode(dir string) error { From 882060913cc1cdfe8470f2b834ec68f04fa35d55 Mon Sep 17 00:00:00 2001 From: jhnstn Date: Mon, 6 Nov 2023 15:15:36 -0500 Subject: [PATCH 2/3] Rename directory --- {cli => gbm-cli}/README.md | 0 {cli => gbm-cli}/bin/.gitkeep | 0 {cli => gbm-cli}/bin/gbm | Bin {cli => gbm-cli}/cmd/README.md | 0 {cli => gbm-cli}/cmd/release/README.md | 0 {cli => gbm-cli}/cmd/release/integrate.go | 12 ++++++------ {cli => gbm-cli}/cmd/release/prepare/README.md | 0 {cli => gbm-cli}/cmd/release/prepare/all.go | 6 +++--- {cli => gbm-cli}/cmd/release/prepare/gb.go | 6 +++--- {cli => gbm-cli}/cmd/release/prepare/gbm.go | 6 +++--- {cli => gbm-cli}/cmd/release/prepare/root.go | 14 +++++++------- {cli => gbm-cli}/cmd/release/root.go | 4 ++-- {cli => gbm-cli}/cmd/release/status.go | 12 ++++++------ {cli => gbm-cli}/cmd/render/README.md | 0 {cli => gbm-cli}/cmd/render/aztec.go | 2 +- {cli => gbm-cli}/cmd/render/checklist.go | 8 ++++---- {cli => gbm-cli}/cmd/render/root.go | 2 +- {cli => gbm-cli}/cmd/render/utils.go | 2 +- {cli => gbm-cli}/cmd/root.go | 6 +++--- {cli => gbm-cli}/cmd/utils/utils.go | 4 ++-- {cli => gbm-cli}/cmd/workspace/workspace.go | 2 +- {cli => gbm-cli}/go.mod | 2 +- {cli => gbm-cli}/go.sum | 0 {cli => gbm-cli}/main.go | 4 ++-- {cli => gbm-cli}/pkg/console/console.go | 0 {cli => gbm-cli}/pkg/gbm/aztec.go | 0 {cli => gbm-cli}/pkg/gbm/builds.go | 2 +- {cli => gbm-cli}/pkg/gbm/search.go | 4 ++-- {cli => gbm-cli}/pkg/gh/gh.go | 6 +++--- {cli => gbm-cli}/pkg/release/constants.go | 0 {cli => gbm-cli}/pkg/release/gb.go | 12 ++++++------ {cli => gbm-cli}/pkg/release/gbm.go | 16 ++++++++-------- .../pkg/release/integrate/android.go | 12 ++++++------ .../pkg/release/integrate/integrate.go | 12 ++++++------ .../pkg/release/integrate/integrate_test.go | 0 {cli => gbm-cli}/pkg/release/integrate/ios.go | 14 +++++++------- {cli => gbm-cli}/pkg/release/main.go | 4 ++-- {cli => gbm-cli}/pkg/release/search.go | 4 ++-- {cli => gbm-cli}/pkg/release/utils.go | 8 ++++---- {cli => gbm-cli}/pkg/render/render.go | 0 {cli => gbm-cli}/pkg/render/render_test.go | 0 .../pkg/render/testdata/basic_template.txt | 0 .../pkg/render/testdata/func_template.txt | 0 .../pkg/render/testdata/invalid_template.txt | 0 .../pkg/render/testdata/test_template.txt | 0 {cli => gbm-cli}/pkg/repo/repo.go | 0 {cli => gbm-cli}/pkg/repo/repo_test.go | 0 {cli => gbm-cli}/pkg/semver/semver.go | 0 {cli => gbm-cli}/pkg/semver/semver_test.go | 0 {cli => gbm-cli}/pkg/shell/bundler.go | 0 {cli => gbm-cli}/pkg/shell/cmds.go | 0 {cli => gbm-cli}/pkg/shell/git.go | 2 +- {cli => gbm-cli}/pkg/shell/npm.go | 0 {cli => gbm-cli}/pkg/shell/rake.go | 0 {cli => gbm-cli}/pkg/utils/utils.go | 2 +- .../pkg/yq/testdata/ref_commit.yaml | 0 {cli => gbm-cli}/pkg/yq/testdata/ref_tag.yaml | 0 .../pkg/yq/testdata/ref_tag_commit.yaml | 0 {cli => gbm-cli}/pkg/yq/yq.go | 0 {cli => gbm-cli}/pkg/yq/yq_test.go | 0 {cli => gbm-cli}/templates/.gitkeep | 0 {cli => gbm-cli}/templates/checklist/aztec.html | 0 .../templates/checklist/checklist.html | 0 {cli => gbm-cli}/templates/checklist/task.html | 0 .../templates/release/gb_pr_body.md | 0 .../templates/release/gbm_pr_body.md | 0 .../templates/release/integrate_pr_body.md | 0 67 files changed, 95 insertions(+), 95 deletions(-) rename {cli => gbm-cli}/README.md (100%) rename {cli => gbm-cli}/bin/.gitkeep (100%) rename {cli => gbm-cli}/bin/gbm (100%) rename {cli => gbm-cli}/cmd/README.md (100%) rename {cli => gbm-cli}/cmd/release/README.md (100%) rename {cli => gbm-cli}/cmd/release/integrate.go (86%) rename {cli => gbm-cli}/cmd/release/prepare/README.md (100%) rename {cli => gbm-cli}/cmd/release/prepare/all.go (84%) rename {cli => gbm-cli}/cmd/release/prepare/gb.go (74%) rename {cli => gbm-cli}/cmd/release/prepare/gbm.go (70%) rename {cli => gbm-cli}/cmd/release/prepare/root.go (79%) rename {cli => gbm-cli}/cmd/release/root.go (85%) rename {cli => gbm-cli}/cmd/release/status.go (86%) rename {cli => gbm-cli}/cmd/render/README.md (100%) rename {cli => gbm-cli}/cmd/render/aztec.go (81%) rename {cli => gbm-cli}/cmd/render/checklist.go (88%) rename {cli => gbm-cli}/cmd/render/root.go (88%) rename {cli => gbm-cli}/cmd/render/utils.go (85%) rename {cli => gbm-cli}/cmd/root.go (61%) rename {cli => gbm-cli}/cmd/utils/utils.go (77%) rename {cli => gbm-cli}/cmd/workspace/workspace.go (95%) rename {cli => gbm-cli}/go.mod (99%) rename {cli => gbm-cli}/go.sum (100%) rename {cli => gbm-cli}/main.go (55%) rename {cli => gbm-cli}/pkg/console/console.go (100%) rename {cli => gbm-cli}/pkg/gbm/aztec.go (100%) rename {cli => gbm-cli}/pkg/gbm/builds.go (90%) rename {cli => gbm-cli}/pkg/gbm/search.go (83%) rename {cli => gbm-cli}/pkg/gh/gh.go (97%) rename {cli => gbm-cli}/pkg/release/constants.go (100%) rename {cli => gbm-cli}/pkg/release/gb.go (93%) rename {cli => gbm-cli}/pkg/release/gbm.go (94%) rename {cli => gbm-cli}/pkg/release/integrate/android.go (79%) rename {cli => gbm-cli}/pkg/release/integrate/integrate.go (91%) rename {cli => gbm-cli}/pkg/release/integrate/integrate_test.go (100%) rename {cli => gbm-cli}/pkg/release/integrate/ios.go (79%) rename {cli => gbm-cli}/pkg/release/main.go (61%) rename {cli => gbm-cli}/pkg/release/search.go (90%) rename {cli => gbm-cli}/pkg/release/utils.go (94%) rename {cli => gbm-cli}/pkg/render/render.go (100%) rename {cli => gbm-cli}/pkg/render/render_test.go (100%) rename {cli => gbm-cli}/pkg/render/testdata/basic_template.txt (100%) rename {cli => gbm-cli}/pkg/render/testdata/func_template.txt (100%) rename {cli => gbm-cli}/pkg/render/testdata/invalid_template.txt (100%) rename {cli => gbm-cli}/pkg/render/testdata/test_template.txt (100%) rename {cli => gbm-cli}/pkg/repo/repo.go (100%) rename {cli => gbm-cli}/pkg/repo/repo_test.go (100%) rename {cli => gbm-cli}/pkg/semver/semver.go (100%) rename {cli => gbm-cli}/pkg/semver/semver_test.go (100%) rename {cli => gbm-cli}/pkg/shell/bundler.go (100%) rename {cli => gbm-cli}/pkg/shell/cmds.go (100%) rename {cli => gbm-cli}/pkg/shell/git.go (97%) rename {cli => gbm-cli}/pkg/shell/npm.go (100%) rename {cli => gbm-cli}/pkg/shell/rake.go (100%) rename {cli => gbm-cli}/pkg/utils/utils.go (84%) rename {cli => gbm-cli}/pkg/yq/testdata/ref_commit.yaml (100%) rename {cli => gbm-cli}/pkg/yq/testdata/ref_tag.yaml (100%) rename {cli => gbm-cli}/pkg/yq/testdata/ref_tag_commit.yaml (100%) rename {cli => gbm-cli}/pkg/yq/yq.go (100%) rename {cli => gbm-cli}/pkg/yq/yq_test.go (100%) rename {cli => gbm-cli}/templates/.gitkeep (100%) rename {cli => gbm-cli}/templates/checklist/aztec.html (100%) rename {cli => gbm-cli}/templates/checklist/checklist.html (100%) rename {cli => gbm-cli}/templates/checklist/task.html (100%) rename {cli => gbm-cli}/templates/release/gb_pr_body.md (100%) rename {cli => gbm-cli}/templates/release/gbm_pr_body.md (100%) rename {cli => gbm-cli}/templates/release/integrate_pr_body.md (100%) diff --git a/cli/README.md b/gbm-cli/README.md similarity index 100% rename from cli/README.md rename to gbm-cli/README.md diff --git a/cli/bin/.gitkeep b/gbm-cli/bin/.gitkeep similarity index 100% rename from cli/bin/.gitkeep rename to gbm-cli/bin/.gitkeep diff --git a/cli/bin/gbm b/gbm-cli/bin/gbm similarity index 100% rename from cli/bin/gbm rename to gbm-cli/bin/gbm diff --git a/cli/cmd/README.md b/gbm-cli/cmd/README.md similarity index 100% rename from cli/cmd/README.md rename to gbm-cli/cmd/README.md diff --git a/cli/cmd/release/README.md b/gbm-cli/cmd/release/README.md similarity index 100% rename from cli/cmd/release/README.md rename to gbm-cli/cmd/release/README.md diff --git a/cli/cmd/release/integrate.go b/gbm-cli/cmd/release/integrate.go similarity index 86% rename from cli/cmd/release/integrate.go rename to gbm-cli/cmd/release/integrate.go index 97708c86..366b4d82 100644 --- a/cli/cmd/release/integrate.go +++ b/gbm-cli/cmd/release/integrate.go @@ -7,12 +7,12 @@ import ( "path/filepath" "github.com/spf13/cobra" - "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/cli/cmd/utils" - wp "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/cli/cmd/workspace" - "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/cli/pkg/console" - "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/cli/pkg/gh" - "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/cli/pkg/release" - "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/cli/pkg/release/integrate" + "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/gbm-cli/cmd/utils" + wp "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/gbm-cli/cmd/workspace" + "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/gbm-cli/pkg/console" + "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/gbm-cli/pkg/gh" + "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/gbm-cli/pkg/release" + "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/gbm-cli/pkg/release/integrate" ) var android, ios, both bool diff --git a/cli/cmd/release/prepare/README.md b/gbm-cli/cmd/release/prepare/README.md similarity index 100% rename from cli/cmd/release/prepare/README.md rename to gbm-cli/cmd/release/prepare/README.md diff --git a/cli/cmd/release/prepare/all.go b/gbm-cli/cmd/release/prepare/all.go similarity index 84% rename from cli/cmd/release/prepare/all.go rename to gbm-cli/cmd/release/prepare/all.go index d0adbb16..f0b6494a 100644 --- a/cli/cmd/release/prepare/all.go +++ b/gbm-cli/cmd/release/prepare/all.go @@ -5,9 +5,9 @@ import ( "path/filepath" "github.com/spf13/cobra" - "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/cli/pkg/console" - "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/cli/pkg/gh" - "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/cli/pkg/release" + "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/gbm-cli/pkg/console" + "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/gbm-cli/pkg/gh" + "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/gbm-cli/pkg/release" ) var allCmd = &cobra.Command{ diff --git a/cli/cmd/release/prepare/gb.go b/gbm-cli/cmd/release/prepare/gb.go similarity index 74% rename from cli/cmd/release/prepare/gb.go rename to gbm-cli/cmd/release/prepare/gb.go index e2b60ec9..8dd51639 100644 --- a/cli/cmd/release/prepare/gb.go +++ b/gbm-cli/cmd/release/prepare/gb.go @@ -2,9 +2,9 @@ package prepare import ( "github.com/spf13/cobra" - "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/cli/pkg/console" - "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/cli/pkg/gh" - "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/cli/pkg/release" + "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/gbm-cli/pkg/console" + "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/gbm-cli/pkg/gh" + "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/gbm-cli/pkg/release" ) var gbCmd = &cobra.Command{ diff --git a/cli/cmd/release/prepare/gbm.go b/gbm-cli/cmd/release/prepare/gbm.go similarity index 70% rename from cli/cmd/release/prepare/gbm.go rename to gbm-cli/cmd/release/prepare/gbm.go index c2b5d6ac..07a42e8c 100644 --- a/cli/cmd/release/prepare/gbm.go +++ b/gbm-cli/cmd/release/prepare/gbm.go @@ -2,9 +2,9 @@ package prepare import ( "github.com/spf13/cobra" - "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/cli/pkg/console" - "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/cli/pkg/gh" - "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/cli/pkg/release" + "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/gbm-cli/pkg/console" + "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/gbm-cli/pkg/gh" + "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/gbm-cli/pkg/release" ) var gbmCmd = &cobra.Command{ diff --git a/cli/cmd/release/prepare/root.go b/gbm-cli/cmd/release/prepare/root.go similarity index 79% rename from cli/cmd/release/prepare/root.go rename to gbm-cli/cmd/release/prepare/root.go index c488ab6b..e019d3aa 100644 --- a/cli/cmd/release/prepare/root.go +++ b/gbm-cli/cmd/release/prepare/root.go @@ -4,13 +4,13 @@ import ( "errors" "github.com/spf13/cobra" - "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/cli/cmd/utils" - wp "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/cli/cmd/workspace" - "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/cli/pkg/console" - "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/cli/pkg/gbm" - "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/cli/pkg/gh" - "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/cli/pkg/release" - "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/cli/pkg/semver" + "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/gbm-cli/cmd/utils" + wp "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/gbm-cli/cmd/workspace" + "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/gbm-cli/pkg/console" + "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/gbm-cli/pkg/gbm" + "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/gbm-cli/pkg/gh" + "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/gbm-cli/pkg/release" + "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/gbm-cli/pkg/semver" ) var exitIfError func(error, int) diff --git a/cli/cmd/release/root.go b/gbm-cli/cmd/release/root.go similarity index 85% rename from cli/cmd/release/root.go rename to gbm-cli/cmd/release/root.go index d0e271d8..eb4d3d9d 100644 --- a/cli/cmd/release/root.go +++ b/gbm-cli/cmd/release/root.go @@ -2,8 +2,8 @@ package release import ( "github.com/spf13/cobra" - "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/cli/cmd/release/prepare" - wp "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/cli/cmd/workspace" + "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/gbm-cli/cmd/release/prepare" + wp "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/gbm-cli/cmd/workspace" ) var exitIfError func(error, int) diff --git a/cli/cmd/release/status.go b/gbm-cli/cmd/release/status.go similarity index 86% rename from cli/cmd/release/status.go rename to gbm-cli/cmd/release/status.go index dea73dfc..f0887d10 100644 --- a/cli/cmd/release/status.go +++ b/gbm-cli/cmd/release/status.go @@ -3,12 +3,12 @@ package release import ( "github.com/fatih/color" "github.com/spf13/cobra" - "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/cli/cmd/utils" - "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/cli/pkg/console" - "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/cli/pkg/gbm" - "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/cli/pkg/gh" - "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/cli/pkg/release" - "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/cli/pkg/repo" + "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/gbm-cli/cmd/utils" + "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/gbm-cli/pkg/console" + "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/gbm-cli/pkg/gbm" + "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/gbm-cli/pkg/gh" + "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/gbm-cli/pkg/release" + "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/gbm-cli/pkg/repo" ) var StatusCmd = &cobra.Command{ diff --git a/cli/cmd/render/README.md b/gbm-cli/cmd/render/README.md similarity index 100% rename from cli/cmd/render/README.md rename to gbm-cli/cmd/render/README.md diff --git a/cli/cmd/render/aztec.go b/gbm-cli/cmd/render/aztec.go similarity index 81% rename from cli/cmd/render/aztec.go rename to gbm-cli/cmd/render/aztec.go index c070a437..8d929823 100644 --- a/cli/cmd/render/aztec.go +++ b/gbm-cli/cmd/render/aztec.go @@ -2,7 +2,7 @@ package render import ( "github.com/spf13/cobra" - "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/cli/pkg/console" + "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/gbm-cli/pkg/console" ) var AztecCmd = &cobra.Command{ diff --git a/cli/cmd/render/checklist.go b/gbm-cli/cmd/render/checklist.go similarity index 88% rename from cli/cmd/render/checklist.go rename to gbm-cli/cmd/render/checklist.go index a73fba9c..705c9c6a 100644 --- a/cli/cmd/render/checklist.go +++ b/gbm-cli/cmd/render/checklist.go @@ -6,10 +6,10 @@ import ( "github.com/spf13/cobra" - "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/cli/pkg/console" - "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/cli/pkg/gbm" - "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/cli/pkg/render" - "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/cli/pkg/semver" + "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/gbm-cli/pkg/console" + "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/gbm-cli/pkg/gbm" + "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/gbm-cli/pkg/render" + "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/gbm-cli/pkg/semver" ) var version string diff --git a/cli/cmd/render/root.go b/gbm-cli/cmd/render/root.go similarity index 88% rename from cli/cmd/render/root.go rename to gbm-cli/cmd/render/root.go index 8ff609df..a2c77a8d 100644 --- a/cli/cmd/render/root.go +++ b/gbm-cli/cmd/render/root.go @@ -4,7 +4,7 @@ import ( "os" "github.com/spf13/cobra" - "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/cli/cmd/utils" + "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/gbm-cli/cmd/utils" ) var writeToClipboard bool diff --git a/cli/cmd/render/utils.go b/gbm-cli/cmd/render/utils.go similarity index 85% rename from cli/cmd/render/utils.go rename to gbm-cli/cmd/render/utils.go index 699b1925..ee406547 100644 --- a/cli/cmd/render/utils.go +++ b/gbm-cli/cmd/render/utils.go @@ -4,7 +4,7 @@ import ( "fmt" "time" - "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/cli/pkg/render" + "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/gbm-cli/pkg/render" ) func renderAztecSteps(conditional bool) (string, error) { diff --git a/cli/cmd/root.go b/gbm-cli/cmd/root.go similarity index 61% rename from cli/cmd/root.go rename to gbm-cli/cmd/root.go index fda378d7..197af17c 100644 --- a/cli/cmd/root.go +++ b/gbm-cli/cmd/root.go @@ -2,9 +2,9 @@ package cmd import ( "github.com/spf13/cobra" - "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/cli/cmd/release" - "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/cli/cmd/render" - "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/cli/pkg/console" + "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/gbm-cli/cmd/release" + "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/gbm-cli/cmd/render" + "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/gbm-cli/pkg/console" ) // rootCmd represents the base command when called without any subcommands diff --git a/cli/cmd/utils/utils.go b/gbm-cli/cmd/utils/utils.go similarity index 77% rename from cli/cmd/utils/utils.go rename to gbm-cli/cmd/utils/utils.go index b9632015..0db3cd53 100644 --- a/cli/cmd/utils/utils.go +++ b/gbm-cli/cmd/utils/utils.go @@ -4,8 +4,8 @@ import ( "fmt" "os" - "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/cli/pkg/console" - "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/cli/pkg/semver" + "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/gbm-cli/pkg/console" + "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/gbm-cli/pkg/semver" ) func GetVersionArg(args []string) (semver.SemVer, error) { diff --git a/cli/cmd/workspace/workspace.go b/gbm-cli/cmd/workspace/workspace.go similarity index 95% rename from cli/cmd/workspace/workspace.go rename to gbm-cli/cmd/workspace/workspace.go index fe1a6c8c..33fd90ab 100644 --- a/cli/cmd/workspace/workspace.go +++ b/gbm-cli/cmd/workspace/workspace.go @@ -5,7 +5,7 @@ import ( "os/signal" "path" - "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/cli/pkg/console" + "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/gbm-cli/pkg/console" ) type Workspace interface { diff --git a/cli/go.mod b/gbm-cli/go.mod similarity index 99% rename from cli/go.mod rename to gbm-cli/go.mod index 9298e829..f170a4df 100644 --- a/cli/go.mod +++ b/gbm-cli/go.mod @@ -1,4 +1,4 @@ -module github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/cli +module github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/gbm-cli go 1.21 diff --git a/cli/go.sum b/gbm-cli/go.sum similarity index 100% rename from cli/go.sum rename to gbm-cli/go.sum diff --git a/cli/main.go b/gbm-cli/main.go similarity index 55% rename from cli/main.go rename to gbm-cli/main.go index 83d31cc9..e5ddd99b 100644 --- a/cli/main.go +++ b/gbm-cli/main.go @@ -6,8 +6,8 @@ package main import ( "embed" - "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/cli/cmd" - "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/cli/pkg/render" + "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/gbm-cli/cmd" + "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/gbm-cli/pkg/render" ) //go:embed templates/* diff --git a/cli/pkg/console/console.go b/gbm-cli/pkg/console/console.go similarity index 100% rename from cli/pkg/console/console.go rename to gbm-cli/pkg/console/console.go diff --git a/cli/pkg/gbm/aztec.go b/gbm-cli/pkg/gbm/aztec.go similarity index 100% rename from cli/pkg/gbm/aztec.go rename to gbm-cli/pkg/gbm/aztec.go diff --git a/cli/pkg/gbm/builds.go b/gbm-cli/pkg/gbm/builds.go similarity index 90% rename from cli/pkg/gbm/builds.go rename to gbm-cli/pkg/gbm/builds.go index 2a8678bf..d7a5fe09 100644 --- a/cli/pkg/gbm/builds.go +++ b/gbm-cli/pkg/gbm/builds.go @@ -1,7 +1,7 @@ package gbm import ( - "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/cli/pkg/gh" + "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/gbm-cli/pkg/gh" ) func AndroidGbmBuildPublished(pr gh.PullRequest) (bool, error) { diff --git a/cli/pkg/gbm/search.go b/gbm-cli/pkg/gbm/search.go similarity index 83% rename from cli/pkg/gbm/search.go rename to gbm-cli/pkg/gbm/search.go index 8c6f1736..6592b742 100644 --- a/cli/pkg/gbm/search.go +++ b/gbm-cli/pkg/gbm/search.go @@ -3,8 +3,8 @@ package gbm import ( "strings" - "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/cli/pkg/console" - "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/cli/pkg/gh" + "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/gbm-cli/pkg/console" + "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/gbm-cli/pkg/gh" ) func FindGbmSyncedPrs(gbmPr gh.PullRequest, filters []gh.RepoFilter) ([]gh.SearchResult, error) { diff --git a/cli/pkg/gh/gh.go b/gbm-cli/pkg/gh/gh.go similarity index 97% rename from cli/pkg/gh/gh.go rename to gbm-cli/pkg/gh/gh.go index 016cdac8..dbdcfcba 100644 --- a/cli/pkg/gh/gh.go +++ b/gbm-cli/pkg/gh/gh.go @@ -11,9 +11,9 @@ import ( "github.com/cli/go-gh/v2/pkg/api" "github.com/fatih/color" - "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/cli/pkg/console" - "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/cli/pkg/repo" - "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/cli/pkg/shell" + "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/gbm-cli/pkg/console" + "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/gbm-cli/pkg/repo" + "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/gbm-cli/pkg/shell" ) // Branch represents a GitHub branch API schema. diff --git a/cli/pkg/release/constants.go b/gbm-cli/pkg/release/constants.go similarity index 100% rename from cli/pkg/release/constants.go rename to gbm-cli/pkg/release/constants.go diff --git a/cli/pkg/release/gb.go b/gbm-cli/pkg/release/gb.go similarity index 93% rename from cli/pkg/release/gb.go rename to gbm-cli/pkg/release/gb.go index e644e15b..a41466e9 100644 --- a/cli/pkg/release/gb.go +++ b/gbm-cli/pkg/release/gb.go @@ -4,12 +4,12 @@ import ( "fmt" "path/filepath" - "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/cli/pkg/console" - "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/cli/pkg/gh" - "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/cli/pkg/render" - "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/cli/pkg/repo" - "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/cli/pkg/shell" - "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/cli/pkg/utils" + "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/gbm-cli/pkg/console" + "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/gbm-cli/pkg/gh" + "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/gbm-cli/pkg/render" + "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/gbm-cli/pkg/repo" + "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/gbm-cli/pkg/shell" + "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/gbm-cli/pkg/utils" ) func CreateGbPR(build Build) (gh.PullRequest, error) { diff --git a/cli/pkg/release/gbm.go b/gbm-cli/pkg/release/gbm.go similarity index 94% rename from cli/pkg/release/gbm.go rename to gbm-cli/pkg/release/gbm.go index 05bcfe45..ba5f40a5 100644 --- a/cli/pkg/release/gbm.go +++ b/gbm-cli/pkg/release/gbm.go @@ -7,14 +7,14 @@ import ( "os" "path/filepath" - "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/cli/pkg/console" - "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/cli/pkg/gbm" - "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/cli/pkg/gh" - "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/cli/pkg/shell" - "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/cli/pkg/utils" - - "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/cli/pkg/render" - "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/cli/pkg/repo" + "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/gbm-cli/pkg/console" + "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/gbm-cli/pkg/gbm" + "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/gbm-cli/pkg/gh" + "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/gbm-cli/pkg/shell" + "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/gbm-cli/pkg/utils" + + "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/gbm-cli/pkg/render" + "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/gbm-cli/pkg/repo" ) func CreateGbmPR(build Build) (gh.PullRequest, error) { diff --git a/cli/pkg/release/integrate/android.go b/gbm-cli/pkg/release/integrate/android.go similarity index 79% rename from cli/pkg/release/integrate/android.go rename to gbm-cli/pkg/release/integrate/android.go index 84886c69..542039c2 100644 --- a/cli/pkg/release/integrate/android.go +++ b/gbm-cli/pkg/release/integrate/android.go @@ -7,13 +7,13 @@ import ( "path/filepath" "regexp" - "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/cli/pkg/console" - "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/cli/pkg/gbm" - "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/cli/pkg/release" + "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/gbm-cli/pkg/console" + "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/gbm-cli/pkg/gbm" + "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/gbm-cli/pkg/release" - "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/cli/pkg/gh" - "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/cli/pkg/repo" - "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/cli/pkg/shell" + "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/gbm-cli/pkg/gh" + "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/gbm-cli/pkg/repo" + "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/gbm-cli/pkg/shell" ) type AndroidIntegration struct { diff --git a/cli/pkg/release/integrate/integrate.go b/gbm-cli/pkg/release/integrate/integrate.go similarity index 91% rename from cli/pkg/release/integrate/integrate.go rename to gbm-cli/pkg/release/integrate/integrate.go index 9f89bf3b..b0f1ab68 100644 --- a/cli/pkg/release/integrate/integrate.go +++ b/gbm-cli/pkg/release/integrate/integrate.go @@ -4,12 +4,12 @@ import ( "errors" "fmt" - "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/cli/pkg/console" - "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/cli/pkg/gh" - "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/cli/pkg/release" - "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/cli/pkg/render" - "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/cli/pkg/repo" - "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/cli/pkg/shell" + "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/gbm-cli/pkg/console" + "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/gbm-cli/pkg/gh" + "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/gbm-cli/pkg/release" + "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/gbm-cli/pkg/render" + "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/gbm-cli/pkg/repo" + "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/gbm-cli/pkg/shell" ) type Integration interface { diff --git a/cli/pkg/release/integrate/integrate_test.go b/gbm-cli/pkg/release/integrate/integrate_test.go similarity index 100% rename from cli/pkg/release/integrate/integrate_test.go rename to gbm-cli/pkg/release/integrate/integrate_test.go diff --git a/cli/pkg/release/integrate/ios.go b/gbm-cli/pkg/release/integrate/ios.go similarity index 79% rename from cli/pkg/release/integrate/ios.go rename to gbm-cli/pkg/release/integrate/ios.go index 38e8fca2..cc79fa96 100644 --- a/cli/pkg/release/integrate/ios.go +++ b/gbm-cli/pkg/release/integrate/ios.go @@ -5,13 +5,13 @@ import ( "os" "path/filepath" - "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/cli/pkg/console" - "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/cli/pkg/gbm" - "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/cli/pkg/gh" - "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/cli/pkg/release" - "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/cli/pkg/repo" - "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/cli/pkg/shell" - "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/cli/pkg/yq" + "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/gbm-cli/pkg/console" + "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/gbm-cli/pkg/gbm" + "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/gbm-cli/pkg/gh" + "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/gbm-cli/pkg/release" + "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/gbm-cli/pkg/repo" + "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/gbm-cli/pkg/shell" + "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/gbm-cli/pkg/yq" ) type IosIntegration struct { diff --git a/cli/pkg/release/main.go b/gbm-cli/pkg/release/main.go similarity index 61% rename from cli/pkg/release/main.go rename to gbm-cli/pkg/release/main.go index ad250508..c65a96ea 100644 --- a/cli/pkg/release/main.go +++ b/gbm-cli/pkg/release/main.go @@ -1,8 +1,8 @@ package release import ( - "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/cli/pkg/gh" - "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/cli/pkg/semver" + "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/gbm-cli/pkg/gh" + "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/gbm-cli/pkg/semver" ) type Build struct { diff --git a/cli/pkg/release/search.go b/gbm-cli/pkg/release/search.go similarity index 90% rename from cli/pkg/release/search.go rename to gbm-cli/pkg/release/search.go index 811f2736..51889f25 100644 --- a/cli/pkg/release/search.go +++ b/gbm-cli/pkg/release/search.go @@ -3,8 +3,8 @@ package release import ( "fmt" - "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/cli/pkg/gh" - "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/cli/pkg/repo" + "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/gbm-cli/pkg/gh" + "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/gbm-cli/pkg/repo" ) func FindGbReleasePr(version string) (gh.PullRequest, error) { diff --git a/cli/pkg/release/utils.go b/gbm-cli/pkg/release/utils.go similarity index 94% rename from cli/pkg/release/utils.go rename to gbm-cli/pkg/release/utils.go index a60dac3f..b229cb47 100644 --- a/cli/pkg/release/utils.go +++ b/gbm-cli/pkg/release/utils.go @@ -11,10 +11,10 @@ import ( "strings" "github.com/fatih/color" - "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/cli/pkg/console" - "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/cli/pkg/gh" - "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/cli/pkg/repo" - "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/cli/pkg/shell" + "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/gbm-cli/pkg/console" + "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/gbm-cli/pkg/gh" + "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/gbm-cli/pkg/repo" + "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/gbm-cli/pkg/shell" ) func CollectReleaseChanges(version string, changelog, relnotes []byte) ([]ReleaseChanges, error) { diff --git a/cli/pkg/render/render.go b/gbm-cli/pkg/render/render.go similarity index 100% rename from cli/pkg/render/render.go rename to gbm-cli/pkg/render/render.go diff --git a/cli/pkg/render/render_test.go b/gbm-cli/pkg/render/render_test.go similarity index 100% rename from cli/pkg/render/render_test.go rename to gbm-cli/pkg/render/render_test.go diff --git a/cli/pkg/render/testdata/basic_template.txt b/gbm-cli/pkg/render/testdata/basic_template.txt similarity index 100% rename from cli/pkg/render/testdata/basic_template.txt rename to gbm-cli/pkg/render/testdata/basic_template.txt diff --git a/cli/pkg/render/testdata/func_template.txt b/gbm-cli/pkg/render/testdata/func_template.txt similarity index 100% rename from cli/pkg/render/testdata/func_template.txt rename to gbm-cli/pkg/render/testdata/func_template.txt diff --git a/cli/pkg/render/testdata/invalid_template.txt b/gbm-cli/pkg/render/testdata/invalid_template.txt similarity index 100% rename from cli/pkg/render/testdata/invalid_template.txt rename to gbm-cli/pkg/render/testdata/invalid_template.txt diff --git a/cli/pkg/render/testdata/test_template.txt b/gbm-cli/pkg/render/testdata/test_template.txt similarity index 100% rename from cli/pkg/render/testdata/test_template.txt rename to gbm-cli/pkg/render/testdata/test_template.txt diff --git a/cli/pkg/repo/repo.go b/gbm-cli/pkg/repo/repo.go similarity index 100% rename from cli/pkg/repo/repo.go rename to gbm-cli/pkg/repo/repo.go diff --git a/cli/pkg/repo/repo_test.go b/gbm-cli/pkg/repo/repo_test.go similarity index 100% rename from cli/pkg/repo/repo_test.go rename to gbm-cli/pkg/repo/repo_test.go diff --git a/cli/pkg/semver/semver.go b/gbm-cli/pkg/semver/semver.go similarity index 100% rename from cli/pkg/semver/semver.go rename to gbm-cli/pkg/semver/semver.go diff --git a/cli/pkg/semver/semver_test.go b/gbm-cli/pkg/semver/semver_test.go similarity index 100% rename from cli/pkg/semver/semver_test.go rename to gbm-cli/pkg/semver/semver_test.go diff --git a/cli/pkg/shell/bundler.go b/gbm-cli/pkg/shell/bundler.go similarity index 100% rename from cli/pkg/shell/bundler.go rename to gbm-cli/pkg/shell/bundler.go diff --git a/cli/pkg/shell/cmds.go b/gbm-cli/pkg/shell/cmds.go similarity index 100% rename from cli/pkg/shell/cmds.go rename to gbm-cli/pkg/shell/cmds.go diff --git a/cli/pkg/shell/git.go b/gbm-cli/pkg/shell/git.go similarity index 97% rename from cli/pkg/shell/git.go rename to gbm-cli/pkg/shell/git.go index 9883c26f..75a7869e 100644 --- a/cli/pkg/shell/git.go +++ b/gbm-cli/pkg/shell/git.go @@ -5,7 +5,7 @@ import ( "os/exec" "strings" - "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/cli/pkg/console" + "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/gbm-cli/pkg/console" ) type GitCmds interface { diff --git a/cli/pkg/shell/npm.go b/gbm-cli/pkg/shell/npm.go similarity index 100% rename from cli/pkg/shell/npm.go rename to gbm-cli/pkg/shell/npm.go diff --git a/cli/pkg/shell/rake.go b/gbm-cli/pkg/shell/rake.go similarity index 100% rename from cli/pkg/shell/rake.go rename to gbm-cli/pkg/shell/rake.go diff --git a/cli/pkg/utils/utils.go b/gbm-cli/pkg/utils/utils.go similarity index 84% rename from cli/pkg/utils/utils.go rename to gbm-cli/pkg/utils/utils.go index 632f2c39..f1d7db9a 100644 --- a/cli/pkg/utils/utils.go +++ b/gbm-cli/pkg/utils/utils.go @@ -4,7 +4,7 @@ import ( "os" "os/exec" - "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/cli/pkg/console" + "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/gbm-cli/pkg/console" ) func SetupNode(dir string) error { diff --git a/cli/pkg/yq/testdata/ref_commit.yaml b/gbm-cli/pkg/yq/testdata/ref_commit.yaml similarity index 100% rename from cli/pkg/yq/testdata/ref_commit.yaml rename to gbm-cli/pkg/yq/testdata/ref_commit.yaml diff --git a/cli/pkg/yq/testdata/ref_tag.yaml b/gbm-cli/pkg/yq/testdata/ref_tag.yaml similarity index 100% rename from cli/pkg/yq/testdata/ref_tag.yaml rename to gbm-cli/pkg/yq/testdata/ref_tag.yaml diff --git a/cli/pkg/yq/testdata/ref_tag_commit.yaml b/gbm-cli/pkg/yq/testdata/ref_tag_commit.yaml similarity index 100% rename from cli/pkg/yq/testdata/ref_tag_commit.yaml rename to gbm-cli/pkg/yq/testdata/ref_tag_commit.yaml diff --git a/cli/pkg/yq/yq.go b/gbm-cli/pkg/yq/yq.go similarity index 100% rename from cli/pkg/yq/yq.go rename to gbm-cli/pkg/yq/yq.go diff --git a/cli/pkg/yq/yq_test.go b/gbm-cli/pkg/yq/yq_test.go similarity index 100% rename from cli/pkg/yq/yq_test.go rename to gbm-cli/pkg/yq/yq_test.go diff --git a/cli/templates/.gitkeep b/gbm-cli/templates/.gitkeep similarity index 100% rename from cli/templates/.gitkeep rename to gbm-cli/templates/.gitkeep diff --git a/cli/templates/checklist/aztec.html b/gbm-cli/templates/checklist/aztec.html similarity index 100% rename from cli/templates/checklist/aztec.html rename to gbm-cli/templates/checklist/aztec.html diff --git a/cli/templates/checklist/checklist.html b/gbm-cli/templates/checklist/checklist.html similarity index 100% rename from cli/templates/checklist/checklist.html rename to gbm-cli/templates/checklist/checklist.html diff --git a/cli/templates/checklist/task.html b/gbm-cli/templates/checklist/task.html similarity index 100% rename from cli/templates/checklist/task.html rename to gbm-cli/templates/checklist/task.html diff --git a/cli/templates/release/gb_pr_body.md b/gbm-cli/templates/release/gb_pr_body.md similarity index 100% rename from cli/templates/release/gb_pr_body.md rename to gbm-cli/templates/release/gb_pr_body.md diff --git a/cli/templates/release/gbm_pr_body.md b/gbm-cli/templates/release/gbm_pr_body.md similarity index 100% rename from cli/templates/release/gbm_pr_body.md rename to gbm-cli/templates/release/gbm_pr_body.md diff --git a/cli/templates/release/integrate_pr_body.md b/gbm-cli/templates/release/integrate_pr_body.md similarity index 100% rename from cli/templates/release/integrate_pr_body.md rename to gbm-cli/templates/release/integrate_pr_body.md From 7345cb6e1c44c41ec3090253bf0d40b0c67a5a87 Mon Sep 17 00:00:00 2001 From: jhnstn Date: Mon, 6 Nov 2023 15:22:13 -0500 Subject: [PATCH 3/3] Fix workflow --- .github/workflows/go.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml index 56cd7574..7d4fec03 100644 --- a/.github/workflows/go.yml +++ b/.github/workflows/go.yml @@ -20,13 +20,13 @@ jobs: uses: actions/setup-go@v4 with: go-version: '1.21' - + - name: Install dependencies run: | - cd ./cli + cd ./gbm-cli go get . - name: Test run: | - cd cli + cd ./gbm-cli go test -v ./...