From 44f15828a363341c14a6b9de85a76e8449699357 Mon Sep 17 00:00:00 2001 From: mert Date: Mon, 11 Apr 2022 12:42:41 +0100 Subject: [PATCH] [vergo:major-release]migrate module to github.com/sky-uk/vergo --- .goreleaser.yml | 18 ++++--------- .travis.yml | 22 +++++++++++++++ CONTRIBUTING.md | 54 +++++++++++++++++++++++++++++++------ GNUmakefile | 24 +++++++++++------ LICENSE | 29 ++++++++++++++++++++ README.md | 29 +++++++++++++------- bump/bump.go | 4 +-- bump/bump_test.go | 6 ++--- cd-scripts/cdBuild.sh | 3 --- cd-scripts/cdRelease.sh | 3 --- cmd/cmd_bump.go | 6 ++--- cmd/cmd_bump_test.go | 4 +-- cmd/cmd_check.go | 2 +- cmd/cmd_check_test.go | 4 +-- cmd/common_test.go | 10 +++---- cmd/get.go | 4 +-- cmd/get_test.go | 6 ++--- cmd/list.go | 2 +- cmd/list_test.go | 2 +- cmd/push.go | 2 +- cmd/root.go | 6 ++--- git/git.go | 2 +- git/git_test.go | 8 +++--- go.mod | 26 ++++++++++++++++-- go.sum | 2 -- internal-test/git_common.go | 2 +- main.go | 2 +- release/release_test.go | 4 +-- 28 files changed, 200 insertions(+), 86 deletions(-) create mode 100644 .travis.yml create mode 100644 LICENSE delete mode 100755 cd-scripts/cdBuild.sh delete mode 100755 cd-scripts/cdRelease.sh diff --git a/.goreleaser.yml b/.goreleaser.yml index 495f0f3..a9d2135 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -19,11 +19,11 @@ builds: ldflags: - -s - -w - - -X github.com/sky-uk/umc-shared/vergo/cmd.version={{.Env.GORELEASER_CURRENT_TAG}} - - -X github.com/sky-uk/umc-shared/vergo/cmd.commit={{.Commit}} - - -X github.com/sky-uk/umc-shared/vergo/cmd.date={{.Date}} - - -X github.com/sky-uk/umc-shared/vergo/cmd.snapshot={{.IsSnapshot}} - - -X "github.com/sky-uk/umc-shared/vergo/cmd.builtBy={{.Env.BUILT_BY}}" + - -X github.com/sky-uk/vergo/cmd.version={{.Env.GORELEASER_CURRENT_TAG}} + - -X github.com/sky-uk/vergo/cmd.commit={{.Commit}} + - -X github.com/sky-uk/vergo/cmd.date={{.Date}} + - -X github.com/sky-uk/vergo/cmd.snapshot={{.IsSnapshot}} + - -X "github.com/sky-uk/vergo/cmd.builtBy={{.Env.BUILT_BY}}" snapshot: name_template: "{{ .Env.GORELEASER_CURRENT_TAG }}" @@ -40,11 +40,3 @@ archives: source: name_template: '{{ .ProjectName }}-{{ .Tag }}' format: tar.gz - -uploads: - # You can have multiple Put instances. - - # Unique name of your Put instance. Used to identify the instance. - name: nexus - method: PUT - mode: archive - target: '{{ .Env.UPLOAD_TARGET }}/{{ .ProjectName }}/{{ .Tag }}/' \ No newline at end of file diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..7cf9021 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,22 @@ +os: linux +dist: xenial +language: go + +go: + - 1.17.x + +before_install: + - git fetch --tags + +cache: + directories: [] + +before_cache: [] + +jobs: + include: + - name: build + script: make release-test check-licenses test + - stage: release + if: (branch = master AND type = push) AND NOT fork + script: make release diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index f0db3d8..f92bd28 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,15 +1,53 @@ # Contributing -## Requirements +Contributions are welcomed! -* go v1.15+ -* goreleaser -* gofmt +When contributing to this repository, please first discuss the change you wish to make via GitHub +issue before making a change. This saves everyone from wasted effort in the event that the proposed +changes need some adjustment before they are ready for submission. -## Testing +## Pull Request Process -Run `make test` from the vergo directory. +1. If your changes include multiple commits, please squash them into a single commit. Stack Overflow + and various blogs can help with this process if you're not already familiar with it. +2. Make sure to commit changes to vendor, ideally as a separate commit to any other code change. +3. Update the README.md where relevant. +4. You may merge the Pull Request in once you have the sign-off, or if you do not have permission to + do that, you may request the reviewer to merge it for you. -## Changelog +## Contributor Code of Conduct -Please ensure you update the `CHANGELOG.md`. \ No newline at end of file +As contributors and maintainers of this project, and in the interest of fostering an open and +welcoming community, we pledge to respect all people who contribute through reporting issues, +posting feature requests, updating documentation, submitting pull requests or patches, and other +activities. + +We are committed to making participation in this project a harassment-free experience for everyone, +regardless of level of experience, gender, gender identity and expression, sexual orientation, +disability, personal appearance, body size, race, ethnicity, age, religion, or nationality. + +Examples of unacceptable behavior by participants include: + +* The use of sexualized language or imagery +* Personal attacks +* Trolling or insulting/derogatory comments +* Public or private harassment +* Publishing other's private information, such as physical or electronic addresses, without explicit + permission +* Other unethical or unprofessional conduct. + +Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, +code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct. By +adopting this Code of Conduct, project maintainers commit themselves to fairly and consistently +applying these principles to every aspect of managing this project. Project maintainers who do not +follow or enforce the Code of Conduct may be permanently removed from the project team. + +This code of conduct applies both within project spaces and in public spaces when an individual is +representing the project or its community. + +Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by opening an +issue or contacting one or more of the project maintainers. + +This Code of Conduct is adapted from the [Contributor Covenant](http://contributor-covenant.org), +version 1.2.0, available at +[http://contributor-covenant.org/version/1/2/0/](http://contributor-covenant.org/version/1/2/0/) \ No newline at end of file diff --git a/GNUmakefile b/GNUmakefile index 7ba2ca8..9813d86 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -4,7 +4,6 @@ export GORELEASER_VERSION := 0.179.0 LINTER_VERSION := 1.43.0 -UPLOAD_TARGET=https://nexus.api.bskyb.com/nexus/content/repositories/nova-packages PATH := $(shell pwd)/bin:$(PATH) SHELL := bash @@ -46,16 +45,16 @@ pre-check: tools golangci-lint run ./... release-test: build - bin/vergo check increment-hint --tag-prefix vergo + bin/vergo check increment-hint release: build - bin/vergo check release --tag-prefix vergo || exit 0 - bin/vergo bump auto --tag-prefix vergo + bin/vergo check release || exit 0 + bin/vergo bump auto BUILT_BY="`goreleaser --version | head -n1`, `go version`" \ - GORELEASER_CURRENT_TAG=`bin/vergo get latest-release --tag-prefix vergo -p` \ - GORELEASER_PREVIOUS_TAG=`bin/vergo get previous-release --tag-prefix vergo -p` \ - goreleaser release --skip-validate --rm-dist - bin/vergo push --tag-prefix vergo + GORELEASER_CURRENT_TAG=`bin/vergo get latest-release -p` \ + GORELEASER_PREVIOUS_TAG=`bin/vergo get previous-release -p` \ + goreleaser release --rm-dist + #bin/vergo push unit-tests: pre-check go clean -testcache @@ -80,3 +79,12 @@ build: pre-check dependency-updates: @go list -u -f '{{if (and (not (or .Main .Indirect)) .Update)}}{{.Path}}: {{.Version}} -> {{.Update.Version}}{{end}}' -m all + +go-licenses: + @go install github.com/google/go-licenses@latest + +print-licenses: go-licenses + @go-licenses csv . + +check-licenses: go-licenses + !(go-licenses csv . | grep -E 'GNU|AGPL|GPL|MPL|CPL|CDDL|EPL|CCBYNC|Facebook|WTFPL') \ No newline at end of file diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..4c75d6a --- /dev/null +++ b/LICENSE @@ -0,0 +1,29 @@ +BSD 3-Clause License + +Copyright (c) 2022, Sky UK Ltd +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + +* Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. + +* Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + +* Neither the name of the copyright holder nor the names of its + contributors may be used to endorse or promote products derived from + this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE +FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. \ No newline at end of file diff --git a/README.md b/README.md index 9bb99a3..8b31b6e 100644 --- a/README.md +++ b/README.md @@ -5,22 +5,36 @@ Vergo is an executable command line tool that is an alternative to axion gradle plugin (https://github.com/allegro/axion-release-plugin.git) +## Requirements + +* go v1.17+ +* goreleaser +* gofmt + +## Testing + +Run `make test` from the vergo directory. + +## Changelog + +Please ensure you update the `CHANGELOG.md`. + ## Installation ### Mac ```bash -curl -sLo vergo_vergo-0.20.0_darwin_amd64.tar.gz https://nexus.api.bskyb.com/nexus/service/local/repositories/nova-packages/content/vergo/vergo-0.20.0/vergo_vergo-0.20.0_darwin_amd64.tar.gz \ - && tar -xzf vergo_vergo-0.20.0_darwin_amd64.tar.gz -C /usr/local/bin \ - && rm vergo_vergo-0.20.0_darwin_amd64.tar.gz +curl -sLo vergo_0.20.0_darwin_arm64.tar.gz https://github.com/sky-uk/vergo/releases/download/v0.20.0/vergo_0.20.0_darwin_arm64.tar.gz \ + && tar -xzf vergo_0.20.0_darwin_arm64.tar.gz -C /usr/local/bin \ + && rm vergo_0.20.0_darwin_arm64.tar.gz ``` ### Linux ```bash -curl -sLo vergo_vergo-0.20.0_linux_amd64.tar.gz https://nexus.api.bskyb.com/nexus/service/local/repositories/nova-packages/content/vergo/vergo-0.20.0/vergo_vergo-0.20.0_linux_amd64.tar.gz \ - && tar -xzf vergo_vergo-0.20.0_linux_amd64.tar.gz -C /usr/local/bin \ - && rm vergo_vergo-0.20.0_linux_amd64.tar.gz +curl -sLo vergo_0.20.0_linux_arm64.tar.gz https://github.com/sky-uk/vergo/releases/download/v0.20.0/vergo_0.20.0_linux_arm64.tar.gz \ + && tar -xzf vergo_0.20.0_linux_arm64.tar.gz -C /usr/local/bin \ + && rm vergo_0.20.0_linux_arm64.tar.gz ``` @@ -140,6 +154,3 @@ INFO[0000] Set tag project-0.1.2 0.1.2 ``` - -* There is no replacement for `markNextVersion` at the moment. happy to implement this if it is required by other teams. - Nova don't use it. diff --git a/bump/bump.go b/bump/bump.go index 52af510..1934b66 100644 --- a/bump/bump.go +++ b/bump/bump.go @@ -7,8 +7,8 @@ import ( gogit "github.com/go-git/go-git/v5" "github.com/go-git/go-git/v5/plumbing" log "github.com/sirupsen/logrus" - "github.com/sky-uk/umc-shared/vergo/git" - "github.com/sky-uk/umc-shared/vergo/release" + "github.com/sky-uk/vergo/git" + "github.com/sky-uk/vergo/release" "strings" ) diff --git a/bump/bump_test.go b/bump/bump_test.go index bdd58f3..95cd576 100644 --- a/bump/bump_test.go +++ b/bump/bump_test.go @@ -7,9 +7,9 @@ import ( "github.com/go-git/go-git/v5/plumbing" "github.com/go-git/go-git/v5/plumbing/object" "github.com/go-git/go-git/v5/storage/memory" - . "github.com/sky-uk/umc-shared/vergo/bump" - . "github.com/sky-uk/umc-shared/vergo/git" - . "github.com/sky-uk/umc-shared/vergo/internal-test" + . "github.com/sky-uk/vergo/bump" + . "github.com/sky-uk/vergo/git" + . "github.com/sky-uk/vergo/internal-test" "github.com/stretchr/testify/assert" "testing" "time" diff --git a/cd-scripts/cdBuild.sh b/cd-scripts/cdBuild.sh deleted file mode 100755 index 2911902..0000000 --- a/cd-scripts/cdBuild.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash -e - -(cd vergo && make release-test test) diff --git a/cd-scripts/cdRelease.sh b/cd-scripts/cdRelease.sh deleted file mode 100755 index 912cc18..0000000 --- a/cd-scripts/cdRelease.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash -e - -(cd vergo && make release) diff --git a/cmd/cmd_bump.go b/cmd/cmd_bump.go index 72473cc..70629f4 100644 --- a/cmd/cmd_bump.go +++ b/cmd/cmd_bump.go @@ -3,9 +3,9 @@ package cmd import ( "github.com/go-git/go-git/v5" log "github.com/sirupsen/logrus" - "github.com/sky-uk/umc-shared/vergo/bump" - vergo "github.com/sky-uk/umc-shared/vergo/git" - "github.com/sky-uk/umc-shared/vergo/release" + "github.com/sky-uk/vergo/bump" + vergo "github.com/sky-uk/vergo/git" + "github.com/sky-uk/vergo/release" "github.com/spf13/cobra" ) diff --git a/cmd/cmd_bump_test.go b/cmd/cmd_bump_test.go index b1c4b3e..610f4b9 100644 --- a/cmd/cmd_bump_test.go +++ b/cmd/cmd_bump_test.go @@ -2,8 +2,8 @@ package cmd_test import ( "fmt" - "github.com/sky-uk/umc-shared/vergo/bump" - . "github.com/sky-uk/umc-shared/vergo/internal-test" + "github.com/sky-uk/vergo/bump" + . "github.com/sky-uk/vergo/internal-test" "github.com/stretchr/testify/assert" "os" "testing" diff --git a/cmd/cmd_check.go b/cmd/cmd_check.go index 76c1d1d..e796771 100644 --- a/cmd/cmd_check.go +++ b/cmd/cmd_check.go @@ -3,7 +3,7 @@ package cmd import ( "errors" "github.com/go-git/go-git/v5" - "github.com/sky-uk/umc-shared/vergo/release" + "github.com/sky-uk/vergo/release" "github.com/spf13/cobra" ) diff --git a/cmd/cmd_check_test.go b/cmd/cmd_check_test.go index fdb097f..ab1abed 100644 --- a/cmd/cmd_check_test.go +++ b/cmd/cmd_check_test.go @@ -1,8 +1,8 @@ package cmd_test import ( - . "github.com/sky-uk/umc-shared/vergo/internal-test" - "github.com/sky-uk/umc-shared/vergo/release" + . "github.com/sky-uk/vergo/internal-test" + "github.com/sky-uk/vergo/release" "github.com/stretchr/testify/assert" "testing" ) diff --git a/cmd/common_test.go b/cmd/common_test.go index dc6d240..04dce0a 100644 --- a/cmd/common_test.go +++ b/cmd/common_test.go @@ -5,11 +5,11 @@ import ( "errors" "github.com/Masterminds/semver/v3" "github.com/go-git/go-git/v5" - "github.com/sky-uk/umc-shared/vergo/bump" - . "github.com/sky-uk/umc-shared/vergo/cmd" - vergo "github.com/sky-uk/umc-shared/vergo/git" - . "github.com/sky-uk/umc-shared/vergo/internal-test" - "github.com/sky-uk/umc-shared/vergo/release" + "github.com/sky-uk/vergo/bump" + . "github.com/sky-uk/vergo/cmd" + vergo "github.com/sky-uk/vergo/git" + . "github.com/sky-uk/vergo/internal-test" + "github.com/sky-uk/vergo/release" "github.com/spf13/cobra" "github.com/stretchr/testify/assert" "io/ioutil" diff --git a/cmd/get.go b/cmd/get.go index 709bf81..981302b 100644 --- a/cmd/get.go +++ b/cmd/get.go @@ -6,8 +6,8 @@ import ( "github.com/Masterminds/semver/v3" "github.com/go-git/go-git/v5" "github.com/go-git/go-git/v5/plumbing" - vergo "github.com/sky-uk/umc-shared/vergo/git" - "github.com/sky-uk/umc-shared/vergo/release" + vergo "github.com/sky-uk/vergo/git" + "github.com/sky-uk/vergo/release" "github.com/spf13/cobra" "github.com/thoas/go-funk" ) diff --git a/cmd/get_test.go b/cmd/get_test.go index d479629..ebb19ab 100644 --- a/cmd/get_test.go +++ b/cmd/get_test.go @@ -3,9 +3,9 @@ package cmd_test import ( "github.com/go-git/go-git/v5" "github.com/go-git/go-git/v5/plumbing" - vergo "github.com/sky-uk/umc-shared/vergo/git" - . "github.com/sky-uk/umc-shared/vergo/internal-test" - "github.com/sky-uk/umc-shared/vergo/release" + vergo "github.com/sky-uk/vergo/git" + . "github.com/sky-uk/vergo/internal-test" + "github.com/sky-uk/vergo/release" "github.com/stretchr/testify/assert" "os" "testing" diff --git a/cmd/list.go b/cmd/list.go index 33a412c..8c2886a 100644 --- a/cmd/list.go +++ b/cmd/list.go @@ -2,7 +2,7 @@ package cmd import ( "github.com/go-git/go-git/v5" - vergo "github.com/sky-uk/umc-shared/vergo/git" + vergo "github.com/sky-uk/vergo/git" "github.com/spf13/cobra" ) diff --git a/cmd/list_test.go b/cmd/list_test.go index 20c3d50..1be1ed4 100644 --- a/cmd/list_test.go +++ b/cmd/list_test.go @@ -1,7 +1,7 @@ package cmd_test import ( - . "github.com/sky-uk/umc-shared/vergo/internal-test" + . "github.com/sky-uk/vergo/internal-test" "github.com/stretchr/testify/assert" "os" "testing" diff --git a/cmd/push.go b/cmd/push.go index f938f0c..50e0941 100644 --- a/cmd/push.go +++ b/cmd/push.go @@ -2,7 +2,7 @@ package cmd import ( "github.com/go-git/go-git/v5" - vergo "github.com/sky-uk/umc-shared/vergo/git" + vergo "github.com/sky-uk/vergo/git" "github.com/spf13/cobra" ) diff --git a/cmd/root.go b/cmd/root.go index 16fdcd9..1a152d1 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -2,9 +2,9 @@ package cmd import ( log "github.com/sirupsen/logrus" - "github.com/sky-uk/umc-shared/vergo/bump" - vergo "github.com/sky-uk/umc-shared/vergo/git" - "github.com/sky-uk/umc-shared/vergo/release" + "github.com/sky-uk/vergo/bump" + vergo "github.com/sky-uk/vergo/git" + "github.com/sky-uk/vergo/release" "github.com/spf13/cobra" "os" ) diff --git a/git/git.go b/git/git.go index 7437c27..52ae3b4 100644 --- a/git/git.go +++ b/git/git.go @@ -10,7 +10,7 @@ import ( "github.com/go-git/go-git/v5/plumbing/object" "github.com/go-git/go-git/v5/plumbing/transport/ssh" log "github.com/sirupsen/logrus" - "github.com/sky-uk/umc-shared/vergo/release" + "github.com/sky-uk/vergo/release" "golang.org/x/crypto/ssh/agent" "net" "os" diff --git a/git/git_test.go b/git/git_test.go index 0c302c0..c8bccbf 100644 --- a/git/git_test.go +++ b/git/git_test.go @@ -7,10 +7,10 @@ import ( "github.com/go-git/go-git/v5" "github.com/go-git/go-git/v5/plumbing" "github.com/go-git/go-git/v5/plumbing/object" - "github.com/sky-uk/umc-shared/vergo/bump" - . "github.com/sky-uk/umc-shared/vergo/git" - . "github.com/sky-uk/umc-shared/vergo/internal-test" - "github.com/sky-uk/umc-shared/vergo/release" + "github.com/sky-uk/vergo/bump" + . "github.com/sky-uk/vergo/git" + . "github.com/sky-uk/vergo/internal-test" + "github.com/sky-uk/vergo/release" "github.com/stretchr/testify/assert" "github.com/thoas/go-funk" "go.uber.org/atomic" diff --git a/go.mod b/go.mod index f5c8a4d..0278419 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ -module github.com/sky-uk/umc-shared/vergo +module github.com/sky-uk/vergo -go 1.15 +go 1.17 require ( github.com/Masterminds/semver/v3 v3.1.1 @@ -13,3 +13,25 @@ require ( go.uber.org/atomic v1.9.0 golang.org/x/crypto v0.0.0-20220307211146-efcb8507fb70 ) + +require ( + github.com/Microsoft/go-winio v0.4.16 // indirect + github.com/ProtonMail/go-crypto v0.0.0-20210428141323-04723f9f07d7 // indirect + github.com/acomagu/bufpipe v1.0.3 // indirect + github.com/davecgh/go-spew v1.1.1 // indirect + github.com/emirpasic/gods v1.12.0 // indirect + github.com/go-git/gcfg v1.5.0 // indirect + github.com/imdario/mergo v0.3.12 // indirect + github.com/inconshreveable/mousetrap v1.0.0 // indirect + github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect + github.com/kevinburke/ssh_config v0.0.0-20201106050909-4977a11b4351 // indirect + github.com/mitchellh/go-homedir v1.1.0 // indirect + github.com/pmezard/go-difflib v1.0.0 // indirect + github.com/sergi/go-diff v1.1.0 // indirect + github.com/spf13/pflag v1.0.5 // indirect + github.com/xanzy/ssh-agent v0.3.0 // indirect + golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2 // indirect + golang.org/x/sys v0.0.0-20211205182925-97ca703d548d // indirect + gopkg.in/warnings.v0 v0.1.2 // indirect + gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect +) diff --git a/go.sum b/go.sum index 4df7829..ff39ec6 100644 --- a/go.sum +++ b/go.sum @@ -121,7 +121,6 @@ github.com/envoyproxy/protoc-gen-validate v0.6.2/go.mod h1:2t7qjJNvHPx8IjnBOzl9E github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL+zU= github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk= -github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568 h1:BHsljHzVlRcyQhjrss6TZTdY2VfCqZPbv5k3iBFa2ZQ= github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc= github.com/fsnotify/fsnotify v1.5.1/go.mod h1:T3375wBYaZdLLcVNkcVbzGHY7f1l/uK5T5Ai1i3InKU= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= @@ -662,7 +661,6 @@ golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE= google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M= diff --git a/internal-test/git_common.go b/internal-test/git_common.go index 5272e96..2ae4609 100644 --- a/internal-test/git_common.go +++ b/internal-test/git_common.go @@ -9,7 +9,7 @@ import ( "github.com/go-git/go-git/v5/plumbing" "github.com/go-git/go-git/v5/plumbing/object" "github.com/go-git/go-git/v5/storage/memory" - "github.com/sky-uk/umc-shared/vergo/git" + "github.com/sky-uk/vergo/git" "github.com/stretchr/testify/assert" "sort" "testing" diff --git a/main.go b/main.go index 7721a85..82d983f 100644 --- a/main.go +++ b/main.go @@ -1,7 +1,7 @@ package main import ( - "github.com/sky-uk/umc-shared/vergo/cmd" + "github.com/sky-uk/vergo/cmd" "os" ) diff --git a/release/release_test.go b/release/release_test.go index 1724988..d6433e1 100644 --- a/release/release_test.go +++ b/release/release_test.go @@ -3,8 +3,8 @@ package release_test import ( gogit "github.com/go-git/go-git/v5" "github.com/go-git/go-git/v5/plumbing" - . "github.com/sky-uk/umc-shared/vergo/internal-test" - "github.com/sky-uk/umc-shared/vergo/release" + . "github.com/sky-uk/vergo/internal-test" + "github.com/sky-uk/vergo/release" "github.com/stretchr/testify/assert" "testing" )