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.

Sign up for GitHub

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

Jump to bottom

[CLI] Fix module path #215

Merged
merged 5 commits into from
Nov 7, 2023
Merged

[CLI] Fix module path #215

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8f0f762
Fix project path
jhnstn Nov 6, 2023
8820609
Rename directory
jhnstn Nov 6, 2023
7345cb6
Fix workflow
jhnstn Nov 6, 2023
01afab7
Merge trunk and resolve conflicts
derekblank Nov 7, 2023
e9f3586
Merge branch 'trunk' into cli/fix-project-path
jhnstn Nov 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/go.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 ./...
0 cli/README.md → gbm-cli/README.md
View file
Open in desktop
File renamed without changes.
0 cli/Releasing.md → gbm-cli/Releasing.md
View file
Open in desktop
File renamed without changes.
0 cli/Testing.md → gbm-cli/Testing.md
View file
Open in desktop
File renamed without changes.
0 cli/bin/.gitkeep → gbm-cli/bin/.gitkeep
View file
Open in desktop
File renamed without changes.
0 cli/bin/gbm → gbm-cli/bin/gbm
View file
Open in desktop
File renamed without changes.
0 cli/cmd/README.md → gbm-cli/cmd/README.md
View file
Open in desktop
File renamed without changes.
0 cli/cmd/release/README.md → gbm-cli/cmd/release/README.md
View file
Open in desktop
File renamed without changes.
12 changes: 6 additions & 6 deletions cli/cmd/release/integrate.go → gbm-cli/cmd/release/integrate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/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
Expand Down
0 cli/cmd/release/prepare/README.md → gbm-cli/cmd/release/prepare/README.md
View file
Open in desktop
File renamed without changes.
6 changes: 3 additions & 3 deletions cli/cmd/release/prepare/all.go → gbm-cli/cmd/release/prepare/all.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/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{
Expand Down
6 changes: 3 additions & 3 deletions cli/cmd/release/prepare/gb.go → gbm-cli/cmd/release/prepare/gb.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/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{
Expand Down
6 changes: 3 additions & 3 deletions cli/cmd/release/prepare/gbm.go → gbm-cli/cmd/release/prepare/gbm.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/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{
Expand Down
14 changes: 7 additions & 7 deletions cli/cmd/release/prepare/root.go → gbm-cli/cmd/release/prepare/root.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/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)
Expand Down
4 changes: 2 additions & 2 deletions cli/cmd/release/root.go → gbm-cli/cmd/release/root.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/gbm-cli/cmd/release/prepare"
wp "github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/gbm-cli/cmd/workspace"
)

var exitIfError func(error, int)
Expand Down
12 changes: 6 additions & 6 deletions cli/cmd/release/status.go → gbm-cli/cmd/release/status.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/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{
Expand Down
0 cli/cmd/render/README.md → gbm-cli/cmd/render/README.md
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion cli/cmd/render/aztec.go → gbm-cli/cmd/render/aztec.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/gbm-cli/pkg/console"
)

var AztecCmd = &cobra.Command{
Expand Down
8 changes: 4 additions & 4 deletions cli/cmd/render/checklist.go → gbm-cli/cmd/render/checklist.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/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
Expand Down
2 changes: 1 addition & 1 deletion cli/cmd/render/root.go → gbm-cli/cmd/render/root.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/gbm-cli/cmd/utils"
)

var writeToClipboard bool
Expand Down
2 changes: 1 addition & 1 deletion cli/cmd/render/utils.go → gbm-cli/cmd/render/utils.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"fmt"
"time"

"github.com/wordpress-mobile/gbm-cli/pkg/render"
"github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/gbm-cli/pkg/render"
)

func renderAztecSteps(conditional bool) (string, error) {
Expand Down
6 changes: 3 additions & 3 deletions cli/cmd/root.go → gbm-cli/cmd/root.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/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
Expand Down
4 changes: 2 additions & 2 deletions cli/cmd/utils/utils.go → gbm-cli/cmd/utils/utils.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/gbm-cli/pkg/console"
"github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/gbm-cli/pkg/semver"
)

func GetVersionArg(args []string) (semver.SemVer, error) {
Expand Down
2 changes: 1 addition & 1 deletion cli/cmd/workspace/workspace.go → gbm-cli/cmd/workspace/workspace.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"os/signal"
"path"

"github.com/wordpress-mobile/gbm-cli/pkg/console"
"github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/gbm-cli/pkg/console"
)

type Workspace interface {
Expand Down
2 changes: 1 addition & 1 deletion cli/go.mod → gbm-cli/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/wordpress-mobile/gbm-cli
module github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/gbm-cli

go 1.21

Expand Down
0 cli/go.sum → gbm-cli/go.sum
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions cli/main.go → gbm-cli/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/gbm-cli/cmd"
"github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/gbm-cli/pkg/render"
)

//go:embed templates/*
Expand Down
0 cli/pkg/console/console.go → gbm-cli/pkg/console/console.go
View file
Open in desktop
File renamed without changes.
0 cli/pkg/gbm/aztec.go → gbm-cli/pkg/gbm/aztec.go
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion cli/pkg/gbm/builds.go → gbm-cli/pkg/gbm/builds.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package gbm

import (
"github.com/wordpress-mobile/gbm-cli/pkg/gh"
"github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/gbm-cli/pkg/gh"
)

func AndroidGbmBuildPublished(pr gh.PullRequest) (bool, error) {
Expand Down
4 changes: 2 additions & 2 deletions cli/pkg/gbm/search.go → gbm-cli/pkg/gbm/search.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/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) {
Expand Down
6 changes: 3 additions & 3 deletions cli/pkg/gh/gh.go → gbm-cli/pkg/gh/gh.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/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.
Expand Down
0 cli/pkg/release/constants.go → gbm-cli/pkg/release/constants.go
View file
Open in desktop
File renamed without changes.
12 changes: 6 additions & 6 deletions cli/pkg/release/gb.go → gbm-cli/pkg/release/gb.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/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) {
Expand Down
16 changes: 8 additions & 8 deletions cli/pkg/release/gbm.go → gbm-cli/pkg/release/gbm.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/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) {
Expand Down
12 changes: 6 additions & 6 deletions cli/pkg/release/integrate/android.go → gbm-cli/pkg/release/integrate/android.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/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/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/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 {
Expand Down
12 changes: 6 additions & 6 deletions cli/pkg/release/integrate/integrate.go → gbm-cli/pkg/release/integrate/integrate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/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 {
Expand Down
0 cli/pkg/release/integrate/integrate_test.go → ...i/pkg/release/integrate/integrate_test.go
View file
Open in desktop
File renamed without changes.
14 changes: 7 additions & 7 deletions cli/pkg/release/integrate/ios.go → gbm-cli/pkg/release/integrate/ios.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/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 {
Expand Down
4 changes: 2 additions & 2 deletions cli/pkg/release/main.go → gbm-cli/pkg/release/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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/gbm-cli/pkg/gh"
"github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/gbm-cli/pkg/semver"
)

type Build struct {
Expand Down
4 changes: 2 additions & 2 deletions cli/pkg/release/search.go → gbm-cli/pkg/release/search.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/gbm-cli/pkg/gh"
"github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/gbm-cli/pkg/repo"
)

func FindGbReleasePr(version string) (gh.PullRequest, error) {
Expand Down
8 changes: 4 additions & 4 deletions cli/pkg/release/utils.go → gbm-cli/pkg/release/utils.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/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) {
Expand Down
0 cli/pkg/render/render.go → gbm-cli/pkg/render/render.go
View file
Open in desktop
File renamed without changes.
0 cli/pkg/render/render_test.go → gbm-cli/pkg/render/render_test.go
View file
Open in desktop
File renamed without changes.
0 cli/pkg/render/testdata/basic_template.txt → ...li/pkg/render/testdata/basic_template.txt
View file
Open in desktop
File renamed without changes.
0 cli/pkg/render/testdata/func_template.txt → ...cli/pkg/render/testdata/func_template.txt
View file
Open in desktop
File renamed without changes.
0 cli/pkg/render/testdata/invalid_template.txt → .../pkg/render/testdata/invalid_template.txt
View file
Open in desktop
File renamed without changes.
0 cli/pkg/render/testdata/test_template.txt → ...cli/pkg/render/testdata/test_template.txt
View file
Open in desktop
File renamed without changes.
0 cli/pkg/repo/repo.go → gbm-cli/pkg/repo/repo.go
View file
Open in desktop
File renamed without changes.
0 cli/pkg/repo/repo_test.go → gbm-cli/pkg/repo/repo_test.go
View file
Open in desktop
File renamed without changes.
0 cli/pkg/semver/semver.go → gbm-cli/pkg/semver/semver.go
View file
Open in desktop
File renamed without changes.
0 cli/pkg/semver/semver_test.go → gbm-cli/pkg/semver/semver_test.go
View file
Open in desktop
File renamed without changes.
0 cli/pkg/shell/bundler.go → gbm-cli/pkg/shell/bundler.go
View file
Open in desktop
File renamed without changes.
0 cli/pkg/shell/cmds.go → gbm-cli/pkg/shell/cmds.go
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion cli/pkg/shell/git.go → gbm-cli/pkg/shell/git.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"os/exec"
"strings"

"github.com/wordpress-mobile/gbm-cli/pkg/console"
"github.com/wordpress-mobile/release-toolkit-gutenberg-mobile/gbm-cli/pkg/console"
)

type GitCmds interface {
Expand Down
0 cli/pkg/shell/npm.go → gbm-cli/pkg/shell/npm.go
View file
Open in desktop
File renamed without changes.
0 cli/pkg/shell/rake.go → gbm-cli/pkg/shell/rake.go
View file
Open in desktop
File renamed without changes.
Loading
Loading