diff --git a/.goreleaser.yml b/.goreleaser.yml index c8ffa8997e1..5e0221ee27d 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -10,9 +10,9 @@ builds: - binary: bin/gh main: ./cmd/gh ldflags: - - -s -w -X github.com/github/gh-cli/command.Version={{.Version}} -X github.com/github/gh-cli/command.BuildDate={{time "2006-01-02"}} - - -X github.com/github/gh-cli/context.oauthClientID={{.Env.GH_OAUTH_CLIENT_ID}} - - -X github.com/github/gh-cli/context.oauthClientSecret={{.Env.GH_OAUTH_CLIENT_SECRET}} + - -s -w -X github.com/cli/cli/command.Version={{.Version}} -X github.com/cli/cli/command.BuildDate={{time "2006-01-02"}} + - -X github.com/cli/cli/context.oauthClientID={{.Env.GH_OAUTH_CLIENT_ID}} + - -X github.com/cli/cli/context.oauthClientSecret={{.Env.GH_OAUTH_CLIENT_SECRET}} - -X main.updaterEnabled=github/homebrew-gh goos: - linux @@ -33,7 +33,7 @@ archives: nfpms: - license: MIT maintainer: GitHub - homepage: https://github.com/github/gh-cli + homepage: https://github.com/cli/cli bindir: /usr/local dependencies: - git diff --git a/Makefile b/Makefile index d3cb03449d7..00b17185863 100644 --- a/Makefile +++ b/Makefile @@ -2,11 +2,11 @@ BUILD_FILES = $(shell go list -f '{{range .GoFiles}}{{$$.Dir}}/{{.}}\ {{end}}' ./...) GH_VERSION ?= $(shell git describe --tags 2>/dev/null || git rev-parse --short HEAD) -LDFLAGS := -X github.com/github/gh-cli/command.Version=$(GH_VERSION) $(LDFLAGS) -LDFLAGS := -X github.com/github/gh-cli/command.BuildDate=$(shell date +%Y-%m-%d) $(LDFLAGS) +LDFLAGS := -X github.com/cli/cli/command.Version=$(GH_VERSION) $(LDFLAGS) +LDFLAGS := -X github.com/cli/cli/command.BuildDate=$(shell date +%Y-%m-%d) $(LDFLAGS) ifdef GH_OAUTH_CLIENT_SECRET - LDFLAGS := -X github.com/github/gh-cli/context.oauthClientID=$(GH_OAUTH_CLIENT_ID) $(LDFLAGS) - LDFLAGS := -X github.com/github/gh-cli/context.oauthClientSecret=$(GH_OAUTH_CLIENT_SECRET) $(LDFLAGS) + LDFLAGS := -X github.com/cli/cli/context.oauthClientID=$(GH_OAUTH_CLIENT_ID) $(LDFLAGS) + LDFLAGS := -X github.com/cli/cli/context.oauthClientSecret=$(GH_OAUTH_CLIENT_SECRET) $(LDFLAGS) endif bin/gh: $(BUILD_FILES) diff --git a/api/queries_issue.go b/api/queries_issue.go index 33e5b2143e8..934467e056c 100644 --- a/api/queries_issue.go +++ b/api/queries_issue.go @@ -4,7 +4,7 @@ import ( "fmt" "time" - "github.com/github/gh-cli/internal/ghrepo" + "github.com/cli/cli/internal/ghrepo" ) type IssuesPayload struct { diff --git a/api/queries_pr.go b/api/queries_pr.go index af7e30e68c5..734245acbbf 100644 --- a/api/queries_pr.go +++ b/api/queries_pr.go @@ -4,7 +4,7 @@ import ( "fmt" "strings" - "github.com/github/gh-cli/internal/ghrepo" + "github.com/cli/cli/internal/ghrepo" ) type PullRequestsPayload struct { diff --git a/api/queries_repo.go b/api/queries_repo.go index 46b0fa96acc..9d0c4f00def 100644 --- a/api/queries_repo.go +++ b/api/queries_repo.go @@ -7,7 +7,7 @@ import ( "sort" "strings" - "github.com/github/gh-cli/internal/ghrepo" + "github.com/cli/cli/internal/ghrepo" ) // Repository contains information about a GitHub repo diff --git a/cmd/gen-docs/main.go b/cmd/gen-docs/main.go index 8b8cf358563..943c363230b 100644 --- a/cmd/gen-docs/main.go +++ b/cmd/gen-docs/main.go @@ -4,7 +4,7 @@ import ( "fmt" "os" - "github.com/github/gh-cli/command" + "github.com/cli/cli/command" "github.com/spf13/cobra/doc" ) diff --git a/cmd/gh/main.go b/cmd/gh/main.go index 15925a6a941..00ee1e00cf8 100644 --- a/cmd/gh/main.go +++ b/cmd/gh/main.go @@ -9,10 +9,10 @@ import ( "path" "strings" - "github.com/github/gh-cli/command" - "github.com/github/gh-cli/context" - "github.com/github/gh-cli/update" - "github.com/github/gh-cli/utils" + "github.com/cli/cli/command" + "github.com/cli/cli/context" + "github.com/cli/cli/update" + "github.com/cli/cli/utils" "github.com/mattn/go-isatty" "github.com/mgutz/ansi" "github.com/spf13/cobra" diff --git a/cmd/gh/main_test.go b/cmd/gh/main_test.go index 3a62f6470e0..3e0a02690b8 100644 --- a/cmd/gh/main_test.go +++ b/cmd/gh/main_test.go @@ -7,7 +7,7 @@ import ( "net" "testing" - "github.com/github/gh-cli/command" + "github.com/cli/cli/command" "github.com/spf13/cobra" ) diff --git a/command/issue.go b/command/issue.go index fea96ace6cb..711df46a6ba 100644 --- a/command/issue.go +++ b/command/issue.go @@ -10,11 +10,11 @@ import ( "strings" "time" - "github.com/github/gh-cli/api" - "github.com/github/gh-cli/git" - "github.com/github/gh-cli/internal/ghrepo" - "github.com/github/gh-cli/pkg/githubtemplate" - "github.com/github/gh-cli/utils" + "github.com/cli/cli/api" + "github.com/cli/cli/git" + "github.com/cli/cli/internal/ghrepo" + "github.com/cli/cli/pkg/githubtemplate" + "github.com/cli/cli/utils" "github.com/spf13/cobra" "github.com/spf13/pflag" ) diff --git a/command/issue_test.go b/command/issue_test.go index 9cf4156b4d2..cc18dcdf275 100644 --- a/command/issue_test.go +++ b/command/issue_test.go @@ -9,7 +9,7 @@ import ( "regexp" "testing" - "github.com/github/gh-cli/utils" + "github.com/cli/cli/utils" ) func TestIssueStatus(t *testing.T) { diff --git a/command/pr.go b/command/pr.go index 02e67814fe9..1a227cc6359 100644 --- a/command/pr.go +++ b/command/pr.go @@ -10,11 +10,11 @@ import ( "strconv" "strings" - "github.com/github/gh-cli/api" - "github.com/github/gh-cli/context" - "github.com/github/gh-cli/git" - "github.com/github/gh-cli/internal/ghrepo" - "github.com/github/gh-cli/utils" + "github.com/cli/cli/api" + "github.com/cli/cli/context" + "github.com/cli/cli/git" + "github.com/cli/cli/internal/ghrepo" + "github.com/cli/cli/utils" "github.com/spf13/cobra" "github.com/spf13/pflag" ) diff --git a/command/pr_checkout_test.go b/command/pr_checkout_test.go index 93eaf81bb38..ba0ddff2291 100644 --- a/command/pr_checkout_test.go +++ b/command/pr_checkout_test.go @@ -6,8 +6,8 @@ import ( "strings" "testing" - "github.com/github/gh-cli/context" - "github.com/github/gh-cli/utils" + "github.com/cli/cli/context" + "github.com/cli/cli/utils" ) func TestPRCheckout_sameRepo(t *testing.T) { diff --git a/command/pr_create.go b/command/pr_create.go index 45dabd10c99..279a19e65f5 100644 --- a/command/pr_create.go +++ b/command/pr_create.go @@ -7,12 +7,12 @@ import ( "sort" "time" - "github.com/github/gh-cli/api" - "github.com/github/gh-cli/context" - "github.com/github/gh-cli/git" - "github.com/github/gh-cli/internal/ghrepo" - "github.com/github/gh-cli/pkg/githubtemplate" - "github.com/github/gh-cli/utils" + "github.com/cli/cli/api" + "github.com/cli/cli/context" + "github.com/cli/cli/git" + "github.com/cli/cli/internal/ghrepo" + "github.com/cli/cli/pkg/githubtemplate" + "github.com/cli/cli/utils" "github.com/spf13/cobra" ) diff --git a/command/pr_create_test.go b/command/pr_create_test.go index 94f040f27f8..e6e8c370f82 100644 --- a/command/pr_create_test.go +++ b/command/pr_create_test.go @@ -10,12 +10,12 @@ import ( "strings" "testing" - "github.com/github/gh-cli/api" - "github.com/github/gh-cli/context" - "github.com/github/gh-cli/git" - "github.com/github/gh-cli/internal/ghrepo" - "github.com/github/gh-cli/test" - "github.com/github/gh-cli/utils" + "github.com/cli/cli/api" + "github.com/cli/cli/context" + "github.com/cli/cli/git" + "github.com/cli/cli/internal/ghrepo" + "github.com/cli/cli/test" + "github.com/cli/cli/utils" ) func TestPrCreateHelperProcess(*testing.T) { diff --git a/command/pr_test.go b/command/pr_test.go index 9c17c3d4fbf..d51e3232580 100644 --- a/command/pr_test.go +++ b/command/pr_test.go @@ -11,7 +11,7 @@ import ( "strings" "testing" - "github.com/github/gh-cli/utils" + "github.com/cli/cli/utils" "github.com/google/shlex" "github.com/spf13/cobra" "github.com/spf13/pflag" diff --git a/command/root.go b/command/root.go index be94146d851..0442cbdbfc9 100644 --- a/command/root.go +++ b/command/root.go @@ -7,9 +7,9 @@ import ( "regexp" "strings" - "github.com/github/gh-cli/api" - "github.com/github/gh-cli/context" - "github.com/github/gh-cli/utils" + "github.com/cli/cli/api" + "github.com/cli/cli/context" + "github.com/cli/cli/utils" "github.com/spf13/cobra" ) diff --git a/command/testing.go b/command/testing.go index 7758d4a8b4c..370ba7b53a2 100644 --- a/command/testing.go +++ b/command/testing.go @@ -3,8 +3,8 @@ package command import ( "errors" - "github.com/github/gh-cli/api" - "github.com/github/gh-cli/context" + "github.com/cli/cli/api" + "github.com/cli/cli/context" ) func initBlankContext(repo, branch string) { diff --git a/command/title_body_survey.go b/command/title_body_survey.go index 914d03c0b54..fba5b8282d6 100644 --- a/command/title_body_survey.go +++ b/command/title_body_survey.go @@ -4,8 +4,8 @@ import ( "fmt" "github.com/AlecAivazis/survey/v2" - "github.com/github/gh-cli/pkg/githubtemplate" - "github.com/github/gh-cli/pkg/surveyext" + "github.com/cli/cli/pkg/githubtemplate" + "github.com/cli/cli/pkg/surveyext" "github.com/spf13/cobra" ) diff --git a/context/blank_context.go b/context/blank_context.go index 779917e5085..871d91d21a0 100644 --- a/context/blank_context.go +++ b/context/blank_context.go @@ -4,8 +4,8 @@ import ( "fmt" "strings" - "github.com/github/gh-cli/git" - "github.com/github/gh-cli/internal/ghrepo" + "github.com/cli/cli/git" + "github.com/cli/cli/internal/ghrepo" ) // NewBlank initializes a blank Context suitable for testing diff --git a/context/config_setup.go b/context/config_setup.go index 6a6b5089c86..4d91a4c624b 100644 --- a/context/config_setup.go +++ b/context/config_setup.go @@ -8,8 +8,8 @@ import ( "path/filepath" "strings" - "github.com/github/gh-cli/api" - "github.com/github/gh-cli/auth" + "github.com/cli/cli/api" + "github.com/cli/cli/auth" "gopkg.in/yaml.v3" ) diff --git a/context/context.go b/context/context.go index 66bd3bda012..1ffd6bce68c 100644 --- a/context/context.go +++ b/context/context.go @@ -3,8 +3,8 @@ package context import ( "path" - "github.com/github/gh-cli/git" - "github.com/github/gh-cli/internal/ghrepo" + "github.com/cli/cli/git" + "github.com/cli/cli/internal/ghrepo" "github.com/mitchellh/go-homedir" ) diff --git a/context/remote.go b/context/remote.go index 2018a9cdef4..5ecfa7fecce 100644 --- a/context/remote.go +++ b/context/remote.go @@ -5,8 +5,8 @@ import ( "net/url" "strings" - "github.com/github/gh-cli/git" - "github.com/github/gh-cli/internal/ghrepo" + "github.com/cli/cli/git" + "github.com/cli/cli/internal/ghrepo" ) // Remotes represents a set of git remotes diff --git a/context/remote_test.go b/context/remote_test.go index e083926d8bd..b84d61c7af1 100644 --- a/context/remote_test.go +++ b/context/remote_test.go @@ -4,7 +4,7 @@ import ( "errors" "testing" - "github.com/github/gh-cli/git" + "github.com/cli/cli/git" ) func Test_Remotes_FindByName(t *testing.T) { diff --git a/git/git.go b/git/git.go index fd3a1d96367..92d2dfd0f3f 100644 --- a/git/git.go +++ b/git/git.go @@ -9,7 +9,7 @@ import ( "regexp" "strings" - "github.com/github/gh-cli/utils" + "github.com/cli/cli/utils" ) func VerifyRef(ref string) bool { diff --git a/git/git_test.go b/git/git_test.go index ebf10baf9c5..6ac80e89618 100644 --- a/git/git_test.go +++ b/git/git_test.go @@ -6,7 +6,7 @@ import ( "regexp" "testing" - "github.com/github/gh-cli/test" + "github.com/cli/cli/test" ) func TestGitStatusHelperProcess(*testing.T) { diff --git a/git/remote.go b/git/remote.go index 9bb24146fa0..0df077efba9 100644 --- a/git/remote.go +++ b/git/remote.go @@ -6,7 +6,7 @@ import ( "regexp" "strings" - "github.com/github/gh-cli/utils" + "github.com/cli/cli/utils" ) var remoteRE = regexp.MustCompile(`(.+)\s+(.+)\s+\((push|fetch)\)`) diff --git a/go.mod b/go.mod index f0cf8445adc..10648454640 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/github/gh-cli +module github.com/cli/cli go 1.13 diff --git a/pkg/surveyext/editor.go b/pkg/surveyext/editor.go index a0c3d29a39c..236344d8415 100644 --- a/pkg/surveyext/editor.go +++ b/pkg/surveyext/editor.go @@ -1,7 +1,7 @@ package surveyext // This file extends survey.Editor to give it more flexible behavior. For more context, read -// https://github.com/github/gh-cli/issues/70 +// https://github.com/cli/cli/issues/70 // To see what we extended, search through for EXTENDED comments. import ( diff --git a/test/fixtures/prStatus.json b/test/fixtures/prStatus.json index 5145758349f..d2996b71c6e 100644 --- a/test/fixtures/prStatus.json +++ b/test/fixtures/prStatus.json @@ -8,7 +8,7 @@ "node": { "number": 10, "title": "Blueberries are a good fruit", - "url": "https://github.com/github/gh-cli/pull/10", + "url": "https://github.com/cli/cli/pull/10", "headRefName": "blueberries", "headRepositoryOwner": { "login": "OWNER" @@ -26,7 +26,7 @@ "node": { "number": 8, "title": "Strawberries are not actually berries", - "url": "https://github.com/github/gh-cli/pull/8", + "url": "https://github.com/cli/cli/pull/8", "headRefName": "strawberries" } } @@ -39,7 +39,7 @@ "node": { "number": 9, "title": "Apples are tasty", - "url": "https://github.com/github/gh-cli/pull/9", + "url": "https://github.com/cli/cli/pull/9", "headRefName": "apples" } }, @@ -47,7 +47,7 @@ "node": { "number": 11, "title": "Figs are my favorite", - "url": "https://github.com/github/gh-cli/pull/1", + "url": "https://github.com/cli/cli/pull/1", "headRefName": "figs" } } diff --git a/test/fixtures/prStatusChecks.json b/test/fixtures/prStatusChecks.json index 8b7def7f97d..922fe8ce748 100644 --- a/test/fixtures/prStatusChecks.json +++ b/test/fixtures/prStatusChecks.json @@ -13,7 +13,7 @@ "node": { "number": 8, "title": "Strawberries are not actually berries", - "url": "https://github.com/github/gh-cli/pull/8", + "url": "https://github.com/cli/cli/pull/8", "headRefName": "strawberries", "reviewDecision": "CHANGES_REQUESTED", "commits": { @@ -39,7 +39,7 @@ "node": { "number": 7, "title": "Bananas are berries", - "url": "https://github.com/github/gh-cli/pull/7", + "url": "https://github.com/cli/cli/pull/7", "headRefName": "banananana", "reviewDecision": "APPROVED", "commits": { @@ -66,7 +66,7 @@ "node": { "number": 6, "title": "Avocado is probably not a berry", - "url": "https://github.com/github/gh-cli/pull/6", + "url": "https://github.com/cli/cli/pull/6", "headRefName": "avo", "reviewDecision": "REVIEW_REQUIRED", "commits": { diff --git a/update/update.go b/update/update.go index 4264ea23c57..42eb5955ff3 100644 --- a/update/update.go +++ b/update/update.go @@ -5,7 +5,7 @@ import ( "io/ioutil" "time" - "github.com/github/gh-cli/api" + "github.com/cli/cli/api" "github.com/hashicorp/go-version" "gopkg.in/yaml.v3" ) diff --git a/update/update_test.go b/update/update_test.go index 0fdfb4e29f2..bd919f5307a 100644 --- a/update/update_test.go +++ b/update/update_test.go @@ -8,7 +8,7 @@ import ( "os" "testing" - "github.com/github/gh-cli/api" + "github.com/cli/cli/api" ) func TestCheckForUpdate(t *testing.T) { diff --git a/wix.json b/wix.json index 38951b10b9a..ec9bd32d11d 100644 --- a/wix.json +++ b/wix.json @@ -25,8 +25,8 @@ "shortcuts": {}, "choco": { "description": "Use GitHub from the CLI", - "project-url": "https://github.com/github/gh-cli", + "project-url": "https://github.com/cli/cli", "tags": "github cli git", - "license-url": "https://github.com/github/gh-cli/blob/master/LICENSE" + "license-url": "https://github.com/cli/cli/blob/master/LICENSE" } }