From d04e58e61690730baece7d50e6f6401f83e3def4 Mon Sep 17 00:00:00 2001 From: Emrecan BATI Date: Mon, 7 Aug 2017 10:58:53 +0300 Subject: [PATCH 01/11] Add version command --- cmd/dep/main.go | 1 + cmd/dep/version.go | 45 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 46 insertions(+) create mode 100644 cmd/dep/version.go diff --git a/cmd/dep/main.go b/cmd/dep/main.go index 5b8db13d3c..bb66c8e639 100644 --- a/cmd/dep/main.go +++ b/cmd/dep/main.go @@ -62,6 +62,7 @@ func (c *Config) Run() (exitCode int) { &ensureCommand{}, &hashinCommand{}, &pruneCommand{}, + &versionCommand{}, } examples := [][2]string{ diff --git a/cmd/dep/version.go b/cmd/dep/version.go new file mode 100644 index 0000000000..e6adf34327 --- /dev/null +++ b/cmd/dep/version.go @@ -0,0 +1,45 @@ +// Copyright 2016 The Go Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + +package main + +import ( + "flag" + "runtime" + + "github.com/golang/dep" +) + +var ( + version = "devel" + date string + hash string +) + +const versionHelp = `Show the dep version information` + +func (cmd *versionCommand) Name() string { return "version" } +func (cmd *versionCommand) Args() string { + return "" +} +func (cmd *versionCommand) ShortHelp() string { return versionHelp } +func (cmd *versionCommand) LongHelp() string { return versionHelp } +func (cmd *versionCommand) Hidden() bool { return false } + +func (cmd *versionCommand) Register(fs *flag.FlagSet) {} + +type versionCommand struct{} + +func (cmd *versionCommand) Run(ctx *dep.Ctx, args []string) error { + ctx.Out.Printf(`dep: + version : %s + build date : %s + git hash : %s + go version : %s + go compiler : %s + platform : %s/%s +`, version, date, hash, + runtime.Version(), runtime.Compiler, runtime.GOOS, runtime.GOARCH) + return nil +} From 33610e5cd42f1305b764e7a0185c8fc94531717d Mon Sep 17 00:00:00 2001 From: Emrecan BATI Date: Fri, 11 Aug 2017 22:45:42 +0300 Subject: [PATCH 02/11] Add deploy stage to CI Test test2 asd asdasd asd --- .travis.yml | 29 +++++++++++++++++++++++++++-- cmd/dep/version.go | 8 ++++---- 2 files changed, 31 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 079b64265e..698ee1990a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,3 @@ ---- language: go sudo: false notifications: @@ -6,6 +5,7 @@ notifications: jobs: include: - stage: test + go_import_path: github.com/golang/dep install: - go get -u honnef.co/go/tools/cmd/{gosimple,staticcheck} - npm install -g codeclimate-test-reporter @@ -24,11 +24,13 @@ jobs: - find . -path ./vendor -prune -o -type f -name "*.go" -printf '%P\n' | xargs ./licenseok - set -e; for pkg in $PKGS; do go test -race -coverprofile=profile.out -covermode=atomic $pkg; if [[ -f profile.out ]]; then cat profile.out >> coverage.txt; rm profile.out; fi; done after_success: - - codeclimate-test-reporter < coverage.txt + - echo "CHANGE BACK THIS" + # - codeclimate-test-reporter < coverage.txt # YAML alias, for settings shared across the simpler builds - &simple-test go: 1.7.x stage: test + go_import_path: github.com/golang/dep install: skip env: - DEPTESTBYPASS501=1 @@ -53,3 +55,26 @@ jobs: # Related: https://superuser.com/questions/1044130/why-am-i-having-how-can-i-fix-this-error-shell-session-update-command-not-f - trap EXIT - go test -race $(go list ./... | grep -v vendor) + - go: 1.8.x + stage: deploy + go_import_path: github.com/golang/dep + install: skip + script: skip + before_deploy: + - mkdir -p release + - cd cmd/dep + - CGO_ENABLED=0 GOOS=linux go build -ldflags "-s -w -X main.commitHash=$(git rev-parse --short HEAD 2>/dev/null) -X main.buildDate=$(date --iso-8601=seconds) -X main.version=$(git describe --tags --dirty)" -a -installsuffix cgo -o ../../release/dep-linux-amd64 + - CGO_ENABLED=0 GOOS=darwin go build -ldflags "-s -w -X main.commitHash=$(git rev-parse --short HEAD 2>/dev/null) -X main.buildDate=$(date --iso-8601=seconds) -X main.version=$(git describe --tags --dirty)" -a -installsuffix cgo -o ../../release/dep-darwin-amd64 + - cd ../.. + deploy: + - provider: releases + api_key: + secure: IP1BqLO5WAkI/LFT/4WkiTS7g0zgliUt3y5zqJJKfXatnv4tD/mZIaaJsApjTcVpcI9zbTtZZKFcWPJG3JMVVSUQHSLwupyTk/2dCzUfFadZzRnOtkHysNWJjstYUsNkpr/Qh8Dnvf2HQ7vMA4F2mGMPOA/JT0u4UKJLWmiNdmV0pcqHUqszGnomoXP497bXpvGzn7AMG+QtKe/s5OIihaPoGCfr2UF+tldVPbOuykrlVH8u/Rxv2N8RePjKBNoLWnnMLp6Gg5VvSBJX0Ns7bPx1nQdOiSAY0sNuETe2SDSIoGhuSk9hGppPrCTxcql5SaRnxFigN1zr/XOstFMh9mAzjYG2H2MiRKvRaZFVT8pzvvhSLNKUYsW9G/dts63BJuUdFgV+sp0yeO5al9aR4h7g6QGUlnUJ4rtUE8rB2JINfTFSP1U00i6ihTwDLt7xspAWQ5DaCky3SLeLCuKc9Gj3moMDozW4a2iN/ooujYin3Lbbh65o6bWz71P+sjczb+igXKwOkwxscAwdR7IY3yWJ7hvx0KsDADvLtEeXG4IahL0C7Z2ZzHfAHaLiPvDNZ/CBOzYSjOQDx0c92kFfruts57kwgzNaNUAlzZtv5CdxWZDZ/n2HxOb1Bd74RxW4oyXrxcWS6trHzoPwTJ0RSbO8gfneU7xqBHhp7LXoG4E= + file: + - release/dep-linux-amd64 + - release/dep-darwin-amd64 + skip_cleanup: true + on: + repo: ebati/dep + branch: ci-make-version + tags: true diff --git a/cmd/dep/version.go b/cmd/dep/version.go index e6adf34327..d7a3d33059 100644 --- a/cmd/dep/version.go +++ b/cmd/dep/version.go @@ -12,9 +12,9 @@ import ( ) var ( - version = "devel" - date string - hash string + version = "devel" + buildDate string + commitHash string ) const versionHelp = `Show the dep version information` @@ -39,7 +39,7 @@ func (cmd *versionCommand) Run(ctx *dep.Ctx, args []string) error { go version : %s go compiler : %s platform : %s/%s -`, version, date, hash, +`, version, buildDate, commitHash, runtime.Version(), runtime.Compiler, runtime.GOOS, runtime.GOARCH) return nil } From a189bb1d0c45e6bd23d214e75a1b137d730c7979 Mon Sep 17 00:00:00 2001 From: Emrecan BATI Date: Sat, 12 Aug 2017 13:10:41 +0300 Subject: [PATCH 03/11] Add windows binary --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 698ee1990a..5fb293667d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -65,6 +65,7 @@ jobs: - cd cmd/dep - CGO_ENABLED=0 GOOS=linux go build -ldflags "-s -w -X main.commitHash=$(git rev-parse --short HEAD 2>/dev/null) -X main.buildDate=$(date --iso-8601=seconds) -X main.version=$(git describe --tags --dirty)" -a -installsuffix cgo -o ../../release/dep-linux-amd64 - CGO_ENABLED=0 GOOS=darwin go build -ldflags "-s -w -X main.commitHash=$(git rev-parse --short HEAD 2>/dev/null) -X main.buildDate=$(date --iso-8601=seconds) -X main.version=$(git describe --tags --dirty)" -a -installsuffix cgo -o ../../release/dep-darwin-amd64 + - CGO_ENABLED=0 GOOS=windows go build -ldflags "-s -w -X main.commitHash=$(git rev-parse --short HEAD 2>/dev/null) -X main.buildDate=$(date --iso-8601=seconds) -X main.version=$(git describe --tags --dirty)" -a -installsuffix cgo -o ../../release/dep-windows-amd64 - cd ../.. deploy: - provider: releases From 61c0b0532565d6aedef5c300412f41e43dce0b7d Mon Sep 17 00:00:00 2001 From: Emrecan BATI Date: Sat, 12 Aug 2017 13:22:19 +0300 Subject: [PATCH 04/11] Update documentation --- .github/ISSUE_TEMPLATE.md | 7 +++++-- README.md | 6 +----- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md index fe7b278df1..fe51a5d3d9 100644 --- a/.github/ISSUE_TEMPLATE.md +++ b/.github/ISSUE_TEMPLATE.md @@ -5,7 +5,11 @@ everything here and write out the request, providing as much context as you can. --> -### What version of Go (`go version`) and `dep` (`git describe --tags`) are you using? +### What version of dep are you using (`dep version`)? + ### What `dep` command did you run? @@ -20,4 +24,3 @@ The output of `dep hash-inputs` may also be helpful to include. ### What did you expect to see? ### What did you see instead? - diff --git a/README.md b/README.md index 91b829f1dd..8fe00b3ee7 100644 --- a/README.md +++ b/README.md @@ -37,11 +37,7 @@ That said, keep in mind the following: ## Setup -Get the tool via - -```sh -$ go get -u github.com/golang/dep/cmd/dep -``` +Grab the latest binary from the [releases](https://github.com/golang/dep/releases) page. On macOS you can install or upgrade to the latest released version with Homebrew: From 399752ee5dacb19c95fd111d0977121a8c881187 Mon Sep 17 00:00:00 2001 From: Emrecan BATI Date: Sat, 12 Aug 2017 14:06:59 +0300 Subject: [PATCH 05/11] Add windows release --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 5fb293667d..c7c5a20eba 100644 --- a/.travis.yml +++ b/.travis.yml @@ -74,6 +74,7 @@ jobs: file: - release/dep-linux-amd64 - release/dep-darwin-amd64 + - release/dep-windows-amd64 skip_cleanup: true on: repo: ebati/dep From 9a154325ee3f9075dcb98079a665a1c3850573b2 Mon Sep 17 00:00:00 2001 From: Emrecan BATI Date: Sat, 19 Aug 2017 00:44:34 +0300 Subject: [PATCH 06/11] Move various CI commands to bash files --- .travis.yml | 19 ++++++------------- hack/build-all.bash | 37 +++++++++++++++++++++++++++++++++++++ hack/coverage.bash | 16 ++++++++++++++++ hack/validate-licence.bash | 12 ++++++++++++ hack/validate-linter.bash | 12 ++++++++++++ 5 files changed, 83 insertions(+), 13 deletions(-) create mode 100755 hack/build-all.bash create mode 100755 hack/coverage.bash create mode 100755 hack/validate-licence.bash create mode 100755 hack/validate-linter.bash diff --git a/.travis.yml b/.travis.yml index c7c5a20eba..bc062678eb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,14 +15,9 @@ jobs: go: 1.8.x script: - go build -v ./cmd/dep - - PKGS=$(go list ./... | grep -v /vendor/) - - go vet $PKGS - - staticcheck $PKGS - - gosimple $PKGS + - ./hack/validate-linter.bash - ./hack/validate-vendor.bash - - go build ./hack/licenseok - - find . -path ./vendor -prune -o -type f -name "*.go" -printf '%P\n' | xargs ./licenseok - - set -e; for pkg in $PKGS; do go test -race -coverprofile=profile.out -covermode=atomic $pkg; if [[ -f profile.out ]]; then cat profile.out >> coverage.txt; rm profile.out; fi; done + - ./hack/coverage.bash after_success: - echo "CHANGE BACK THIS" # - codeclimate-test-reporter < coverage.txt @@ -61,20 +56,18 @@ jobs: install: skip script: skip before_deploy: - - mkdir -p release - - cd cmd/dep - - CGO_ENABLED=0 GOOS=linux go build -ldflags "-s -w -X main.commitHash=$(git rev-parse --short HEAD 2>/dev/null) -X main.buildDate=$(date --iso-8601=seconds) -X main.version=$(git describe --tags --dirty)" -a -installsuffix cgo -o ../../release/dep-linux-amd64 - - CGO_ENABLED=0 GOOS=darwin go build -ldflags "-s -w -X main.commitHash=$(git rev-parse --short HEAD 2>/dev/null) -X main.buildDate=$(date --iso-8601=seconds) -X main.version=$(git describe --tags --dirty)" -a -installsuffix cgo -o ../../release/dep-darwin-amd64 - - CGO_ENABLED=0 GOOS=windows go build -ldflags "-s -w -X main.commitHash=$(git rev-parse --short HEAD 2>/dev/null) -X main.buildDate=$(date --iso-8601=seconds) -X main.version=$(git describe --tags --dirty)" -a -installsuffix cgo -o ../../release/dep-windows-amd64 - - cd ../.. + - ./hack/build-all.bash deploy: - provider: releases api_key: secure: IP1BqLO5WAkI/LFT/4WkiTS7g0zgliUt3y5zqJJKfXatnv4tD/mZIaaJsApjTcVpcI9zbTtZZKFcWPJG3JMVVSUQHSLwupyTk/2dCzUfFadZzRnOtkHysNWJjstYUsNkpr/Qh8Dnvf2HQ7vMA4F2mGMPOA/JT0u4UKJLWmiNdmV0pcqHUqszGnomoXP497bXpvGzn7AMG+QtKe/s5OIihaPoGCfr2UF+tldVPbOuykrlVH8u/Rxv2N8RePjKBNoLWnnMLp6Gg5VvSBJX0Ns7bPx1nQdOiSAY0sNuETe2SDSIoGhuSk9hGppPrCTxcql5SaRnxFigN1zr/XOstFMh9mAzjYG2H2MiRKvRaZFVT8pzvvhSLNKUYsW9G/dts63BJuUdFgV+sp0yeO5al9aR4h7g6QGUlnUJ4rtUE8rB2JINfTFSP1U00i6ihTwDLt7xspAWQ5DaCky3SLeLCuKc9Gj3moMDozW4a2iN/ooujYin3Lbbh65o6bWz71P+sjczb+igXKwOkwxscAwdR7IY3yWJ7hvx0KsDADvLtEeXG4IahL0C7Z2ZzHfAHaLiPvDNZ/CBOzYSjOQDx0c92kFfruts57kwgzNaNUAlzZtv5CdxWZDZ/n2HxOb1Bd74RxW4oyXrxcWS6trHzoPwTJ0RSbO8gfneU7xqBHhp7LXoG4E= file: - release/dep-linux-amd64 + - release/dep-linux-amd64.sha256 - release/dep-darwin-amd64 + - release/dep-darwin-amd64.sha256 - release/dep-windows-amd64 + - release/dep-windows-amd64.sha256 skip_cleanup: true on: repo: ebati/dep diff --git a/hack/build-all.bash b/hack/build-all.bash new file mode 100755 index 0000000000..9797593a3e --- /dev/null +++ b/hack/build-all.bash @@ -0,0 +1,37 @@ +#!/usr/bin/env bash +# Copyright 2017 The Go Authors. All rights reserved. +# Use of this source code is governed by a BSD-style +# license that can be found in the LICENSE file. +# +# This script will build dep and calculate hash for each +# (DEP_BUILD_PLATFORMS, DEP_BUILD_ARCHS) pair. +# DEP_BUILD_PLATFORMS="linux" DEP_BUILD_ARCHS="amd64" ./hack/build-all.sh +# can be called to build only for linux-amd64 + +set -e + +VERSION=$(git describe --tags --dirty) +COMMIT_HASH=$(git rev-parse --short HEAD 2>/dev/null) +DATE=$(date --iso-8601) + +GO_BUILD_CMD="go build -a -installsuffix cgo" +GO_BUILD_LDFLAGS="-s -w -X main.commitHash=$COMMIT_HASH -X main.buildDate=$DATE -X main.version=$VERSION" + +if [ -z "$DEP_BUILD_PLATFORMS" ]; then + DEP_BUILD_PLATFORMS="linux windows darwin" +fi + +if [ -z "$DEP_BUILD_ARCHS" ]; then + DEP_BUILD_ARCHS="amd64" +fi + +mkdir -p release + +for OS in ${DEP_BUILD_PLATFORMS[@]}; do + for ARCH in ${DEP_BUILD_ARCHS[@]}; do + echo "Building for $OS/$ARCH" + GOARCH=$ARCH GOOS=$OS CGO_ENABLED=0 $GO_BUILD_CMD -ldflags "$GO_BUILD_LDFLAGS"\ + -o "release/dep-$OS-$ARCH" ./cmd/dep/ + sha256sum "release/dep-$OS-$ARCH" > "release/dep-$OS-$ARCH".sha256 + done +done diff --git a/hack/coverage.bash b/hack/coverage.bash new file mode 100755 index 0000000000..6ad89d9f54 --- /dev/null +++ b/hack/coverage.bash @@ -0,0 +1,16 @@ +#!/usr/bin/env bash +# Copyright 2017 The Go Authors. All rights reserved. +# Use of this source code is governed by a BSD-style +# license that can be found in the LICENSE file. +# +# This script will generate coverage.txt +set -e + +PKGS=$(go list ./... | grep -v /vendor/) +for pkg in $PKGS; do + go test -race -coverprofile=profile.out -covermode=atomic $pkg + if [[ -f profile.out ]]; then + cat profile.out >> coverage.txt + rm profile.out + fi +done diff --git a/hack/validate-licence.bash b/hack/validate-licence.bash new file mode 100755 index 0000000000..c9ff89ec40 --- /dev/null +++ b/hack/validate-licence.bash @@ -0,0 +1,12 @@ +#!/usr/bin/env bash +# Copyright 2017 The Go Authors. All rights reserved. +# Use of this source code is governed by a BSD-style +# license that can be found in the LICENSE file. +# +# This script will build licenseok and run it on all +# source files to check licence +set -e + +go build ./hack/licenseok +find . -path ./vendor -prune -o -type f -name "*.go"\ + -printf '%P\n' | xargs ./licenseok diff --git a/hack/validate-linter.bash b/hack/validate-linter.bash new file mode 100755 index 0000000000..1e446eb3a8 --- /dev/null +++ b/hack/validate-linter.bash @@ -0,0 +1,12 @@ +#!/usr/bin/env bash +# Copyright 2017 The Go Authors. All rights reserved. +# Use of this source code is governed by a BSD-style +# license that can be found in the LICENSE file. +# +# This script will validate code with various linters +set -e + +PKGS=$(go list ./... | grep -v /vendor/) +go vet $PKGS +staticcheck $PKGS +gosimple $PKGS From 52f2cc92aa76e8ab0225ea0086a09a396bd5ac49 Mon Sep 17 00:00:00 2001 From: Emrecan BATI Date: Sat, 19 Aug 2017 00:48:49 +0300 Subject: [PATCH 07/11] Update readme with de-emphasized go get --- README.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/README.md b/README.md index 8fe00b3ee7..24c32a22f3 100644 --- a/README.md +++ b/README.md @@ -46,6 +46,12 @@ $ brew install dep $ brew upgrade dep ``` +You can also install dep via + +```sh +go get -u github.com/dep/cmd/dep +``` + To start managing dependencies using dep, run the following from your project's root directory: ```sh From 2484c39c124833d133021aa0a92a2d106aa93c57 Mon Sep 17 00:00:00 2001 From: Emrecan BATI Date: Sat, 19 Aug 2017 15:44:23 +0300 Subject: [PATCH 08/11] Add brew formula with dryrun option --- .travis.yml | 15 ++++++++++++++- hack/{validate-linter.bash => lint.bash} | 0 2 files changed, 14 insertions(+), 1 deletion(-) rename hack/{validate-linter.bash => lint.bash} (100%) diff --git a/.travis.yml b/.travis.yml index bc062678eb..eb1f99f5dd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,7 +15,7 @@ jobs: go: 1.8.x script: - go build -v ./cmd/dep - - ./hack/validate-linter.bash + - ./hack/lint.bash - ./hack/validate-vendor.bash - ./hack/coverage.bash after_success: @@ -73,3 +73,16 @@ jobs: repo: ebati/dep branch: ci-make-version tags: true + - go: 1.8.x + os: osx + stage: brew-deploy + install: skip + script: skip + deploy: + - provider: script + script: + - brew bump-formula-pr --dry-run --message= --url=https://github.com/ebati/dep/releases/download/$TRAVIS_TAG/dep-darwin-amd64 --sha256=https://github.com/ebati/dep/releases/download/$TRAVIS_TAG/dep-darwin-amd64.sha256 dep + on: + repo: ebati/dep + branch: ci-make-version + tags: true diff --git a/hack/validate-linter.bash b/hack/lint.bash similarity index 100% rename from hack/validate-linter.bash rename to hack/lint.bash From f4428b670275d16db616953d604e8691d16b3858 Mon Sep 17 00:00:00 2001 From: Emrecan BATI Date: Sat, 19 Aug 2017 18:15:20 +0300 Subject: [PATCH 09/11] Add brew update --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index eb1f99f5dd..8d2ca613b9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -81,7 +81,7 @@ jobs: deploy: - provider: script script: - - brew bump-formula-pr --dry-run --message= --url=https://github.com/ebati/dep/releases/download/$TRAVIS_TAG/dep-darwin-amd64 --sha256=https://github.com/ebati/dep/releases/download/$TRAVIS_TAG/dep-darwin-amd64.sha256 dep + - brew update && brew bump-formula-pr --dry-run --message= --url=https://github.com/ebati/dep/releases/download/$TRAVIS_TAG/dep-darwin-amd64 --sha256=https://github.com/ebati/dep/releases/download/$TRAVIS_TAG/dep-darwin-amd64.sha256 dep on: repo: ebati/dep branch: ci-make-version From ad93f483b1204b330b198c0fde1ca1cc2eb8022f Mon Sep 17 00:00:00 2001 From: Emrecan BATI Date: Sun, 20 Aug 2017 11:48:34 +0300 Subject: [PATCH 10/11] Replace variables for golang/dep --- .travis.yml | 22 ++++------------------ 1 file changed, 4 insertions(+), 18 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8d2ca613b9..20e34a0bf1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,8 +19,7 @@ jobs: - ./hack/validate-vendor.bash - ./hack/coverage.bash after_success: - - echo "CHANGE BACK THIS" - # - codeclimate-test-reporter < coverage.txt + - codeclimate-test-reporter < coverage.txt # YAML alias, for settings shared across the simpler builds - &simple-test go: 1.7.x @@ -60,7 +59,7 @@ jobs: deploy: - provider: releases api_key: - secure: IP1BqLO5WAkI/LFT/4WkiTS7g0zgliUt3y5zqJJKfXatnv4tD/mZIaaJsApjTcVpcI9zbTtZZKFcWPJG3JMVVSUQHSLwupyTk/2dCzUfFadZzRnOtkHysNWJjstYUsNkpr/Qh8Dnvf2HQ7vMA4F2mGMPOA/JT0u4UKJLWmiNdmV0pcqHUqszGnomoXP497bXpvGzn7AMG+QtKe/s5OIihaPoGCfr2UF+tldVPbOuykrlVH8u/Rxv2N8RePjKBNoLWnnMLp6Gg5VvSBJX0Ns7bPx1nQdOiSAY0sNuETe2SDSIoGhuSk9hGppPrCTxcql5SaRnxFigN1zr/XOstFMh9mAzjYG2H2MiRKvRaZFVT8pzvvhSLNKUYsW9G/dts63BJuUdFgV+sp0yeO5al9aR4h7g6QGUlnUJ4rtUE8rB2JINfTFSP1U00i6ihTwDLt7xspAWQ5DaCky3SLeLCuKc9Gj3moMDozW4a2iN/ooujYin3Lbbh65o6bWz71P+sjczb+igXKwOkwxscAwdR7IY3yWJ7hvx0KsDADvLtEeXG4IahL0C7Z2ZzHfAHaLiPvDNZ/CBOzYSjOQDx0c92kFfruts57kwgzNaNUAlzZtv5CdxWZDZ/n2HxOb1Bd74RxW4oyXrxcWS6trHzoPwTJ0RSbO8gfneU7xqBHhp7LXoG4E= + secure: fL9GX11J3JLizEBTPZHN32wuAT91eAJsGl0kjlAdIc6Lb/9UCe1XZGgFnpQFN4qo/S+omhHBDbM6Ty1xhNy7xmjDecpQGDU8Rmap9Oll0TuxqMigG+njOuPp5VUYPofPP0PGKdxAcYg+KaFM7x0o2rK+qA046NHwo2gH1BbE+bn55TZglEajEfc8j9iX4jt96KC7zlu+WiKArLmfUtlrI8m8ZYgbYcvFmlYjeCiEqlNhvNL59ejug9Rl0PLtPbamqVXkGLafYtekgPCb4WSxBiCt8pq5Rb5svk9YcdXpiaWQhZjMPAuKN6BrmN2lw1PiXzADUG5fjvNc8eo2HY70GD2utU9cAsY8VIafhoH5n6uM1WI8MHwDfd7P1PiQA3ZGQ8CPwk4q/8HSfQU9ap7vZgSF63pTIbtlviyIG67orOJE9PWWncl9olYM946UylZu6m3hWI/rmJxOeJ1UJjym/3GNPMRfKubaGhV/TyRdM0bKX4M0cXHU6k/ESVFupGXdKRt4RpvkD4/1Km6b2OShW6PNI+ifFspnJr7obkI7dm7ubySdnNz4lMv9WWymxRpMVc8hUAhuoDvXeZJq7pSnkjBEWDxIRoTkA93CU3/Rf7MFYCJMnGSqjcxWUpIfCAk2/r4BqL9NQnqBvvVt+MYi64QaD5n7ZF3dVbr6HZ2zjSU= file: - release/dep-linux-amd64 - release/dep-linux-amd64.sha256 @@ -70,19 +69,6 @@ jobs: - release/dep-windows-amd64.sha256 skip_cleanup: true on: - repo: ebati/dep - branch: ci-make-version - tags: true - - go: 1.8.x - os: osx - stage: brew-deploy - install: skip - script: skip - deploy: - - provider: script - script: - - brew update && brew bump-formula-pr --dry-run --message= --url=https://github.com/ebati/dep/releases/download/$TRAVIS_TAG/dep-darwin-amd64 --sha256=https://github.com/ebati/dep/releases/download/$TRAVIS_TAG/dep-darwin-amd64.sha256 dep - on: - repo: ebati/dep - branch: ci-make-version + repo: golang/dep + branch: master tags: true From 9217125e0c1be14f33ab12dc4d10b9ba187fbe27 Mon Sep 17 00:00:00 2001 From: Emrecan BATI Date: Tue, 29 Aug 2017 07:39:18 +0300 Subject: [PATCH 11/11] Fix wording --- .github/ISSUE_TEMPLATE.md | 6 +++--- README.md | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md index fe51a5d3d9..3e612d9b2a 100644 --- a/.github/ISSUE_TEMPLATE.md +++ b/.github/ISSUE_TEMPLATE.md @@ -5,10 +5,10 @@ everything here and write out the request, providing as much context as you can. --> -### What version of dep are you using (`dep version`)? +### What version of `dep` are you using (`dep version`)? ### What `dep` command did you run? diff --git a/README.md b/README.md index 24c32a22f3..17d441bc08 100644 --- a/README.md +++ b/README.md @@ -46,7 +46,7 @@ $ brew install dep $ brew upgrade dep ``` -You can also install dep via +If you're interested in hacking on `dep`, you can install via `go get`: ```sh go get -u github.com/dep/cmd/dep