Move dependencies to dep

parent 1c1b6146
Pipeline #16232249 passed with stages
in 29 minutes and 18 seconds
This diff is collapsed.
# Gopkg.toml example
#
# Refer to https://github.com/golang/dep/blob/master/docs/Gopkg.toml.md
# for detailed Gopkg.toml documentation.
#
# required = ["github.com/user/thing/cmd/thing"]
# ignored = ["github.com/user/project/pkgX", "bitbucket.org/user/project/pkgA/pkgY"]
#
# [[constraint]]
# name = "github.com/user/project"
# version = "1.0.0"
#
# [[constraint]]
# name = "github.com/user/project2"
# branch = "dev"
# source = "github.com/myfork/project2"
#
# [[override]]
# name = "github.com/x/y"
# version = "2.4.0"
ignored = ["test", "appengine"]
# mimic govendor behaviour - not yet shipped in 0.3.2
# [prune]
# non-go = true
# unused-packages = true
# go-tests = true
[[constraint]]
name = "github.com/BurntSushi/toml"
# version = "v0.2.0"
revision = "a368813c5e648fee92e5f6c30e3944ff9d5e8895"
[[constraint]]
name = "github.com/Sirupsen/logrus"
revision = "4b6ea7319e214d98c938f12692336f7ca9348d6b"
[[constraint]]
branch = "master"
name = "github.com/ayufan/golang-kardianos-service"
[[constraint]]
name = "github.com/docker/distribution"
revision = "325b0804fef3a66309d962357aac3c2ce3f4d329"
[[constraint]]
name = "github.com/docker/docker"
# version = "1.13.0"
revision = "49bf474f9ed7ce7143a59d1964ff7b7fd9b52178"
[[constraint]]
name = "github.com/docker/go-connections"
version = "0.3.0"
[[constraint]]
name = "github.com/docker/machine"
# version = "0.13.0"
revision = "7b7a141da84480342357c51838be142bf183b095"
[[constraint]]
name = "github.com/getsentry/raven-go"
revision = "dffeb57df75d6a911f00232155194e43d79d38d7"
[[constraint]]
name = "github.com/golang/mock"
revision = "06883d979f10cc178f2716846215c8cf90f9e363"
[[constraint]]
name = "github.com/gorhill/cronexpr"
revision = "f0984319b44273e83de132089ae42b1810f4933b"
[[constraint]]
name = "github.com/hashicorp/go-version"
revision = "03c5bf6be031b6dd45afec16b1cf94fc8938bc77"
[[constraint]]
name = "github.com/jpillora/backoff"
revision = "06c7a16c845dc8e0bf575fafeeca0f5462f5eb4d"
[[constraint]]
name = "github.com/kardianos/osext"
revision = "c2c54e542fb797ad986b31721e1baedf214ca413"
# minio introduces a main package with build +ignore
# that depends on downcased "github.com/sirupsen/logrus"
# this constraint points to a fork that removes such file
[[constraint]]
name = "github.com/minio/minio-go"
# version = "3.0.3"
# revision = "4e0f567303d4cc90ceb055a451959fb9fc391fb9"
version = "3.0.3-nolith"
source = "https://github.com/nolith/minio-go"
[[constraint]]
name = "github.com/prometheus/client_golang"
# version = "0.8.0"
revision = "334af0119a8f8fb6af5bb950d535c482cac7f836"
[[constraint]]
name = "github.com/stretchr/testify"
revision = "b1f989447a57594c728884458a39abf3a73447f7"
[[constraint]]
# branch = "master"
name = "github.com/tevino/abool"
revision = "3c25f2fe7cd0ef3eabefce1d90efd69a65d35b12"
[[constraint]]
name = "github.com/urfave/cli"
revision = "cfb38830724cc34fedffe9a2a29fb54fa9169cd1"
[[constraint]]
branch = "master"
name = "gitlab.com/ayufan/golang-cli-helpers"
[[constraint]]
name = "golang.org/x/crypto"
revision = "1f22c0103821b9390939b6776727195525381532"
[[constraint]]
name = "golang.org/x/net"
revision = "f2499483f923065a842d38eb4c7f1927e6fc6e6d"
[[constraint]]
# branch = "v2"
name = "gopkg.in/yaml.v2"
revision = "e4d366fc3c7938e2958e662b4258c7a89e1f0e3e"
[[constraint]]
name = "k8s.io/kubernetes"
# version = "1.3.5"
revision = "b0deb2eb8f4037421077f77cb163dbb4c0a2a9f5"
[[constraint]]
name = "github.com/mattn/go-zglob"
branch = "master"
##
## Refrain innovations ;)
##
[[override]]
name = "cloud.google.com/go"
revision = "05253f6a829103296c351b643f6815aedd81a3fb"
[[override]]
name = "github.com/Azure/go-ansiterm"
revision = "fa152c58bc15761d0200cb75fe958b89a9d4888e"
[[override]]
name = "github.com/Microsoft/go-winio"
revision = "ce2922f643c8fd76b46cadc7f404a06282678b34"
[[override]]
name = "github.com/blang/semver"
version = "v3.3.0"
[[override]]
name = "github.com/coreos/go-oidc"
revision = "1efe0e1303a62da553fcb6beb8bd2aa9250c0ca8"
[[override]]
name = "github.com/docker/docker-credential-helpers"
revision = "b7c53e02cd1a9a01500a58f22d83c6e964bc59db"
[[override]]
name = "github.com/docker/engine-api"
revision = "4290f40c056686fcaa5c9caf02eac1dde9315adf"
[[override]]
name = "github.com/docker/go-units"
revision = "eb879ae3e2b84e2a142af415b679ddeda47ec71c"
[[override]]
name = "github.com/docker/spdystream"
revision = "449fdfce4d962303d702fec724ef0ad181c92528"
[[override]]
name = "github.com/emicklei/go-restful"
revision = "89ef8af493ab468a45a42bb0d89a06fccdd2fb22"
[[override]]
name = "github.com/ghodss/yaml"
revision = "aa0c862057666179de291b67d9f093d12b5a8473"
[[override]]
name = "github.com/go-ini/ini"
revision = "20b96f641a5ea98f2f8619ff4f3e061cff4833bd"
[[override]]
name = "github.com/gogo/protobuf"
revision = "f20a1444730c7d9949b880a0309e737d007def25"
[[override]]
name = "github.com/golang/protobuf"
revision = "f592bd283e9ef86337a432eb50e592278c3d534d"
[[override]]
name = "github.com/google/cadvisor"
revision = "2ed7198f77395ee9a172878a0a7ab92ab59a2cfd"
[[override]]
name = "github.com/google/gofuzz"
revision = "fd52762d25a41827db7ef64c43756fd4b9f7e382"
[[override]]
name = "github.com/gorilla/context"
revision = "08b5f424b9271eedf6f9f0ce86cb9396ed337a42"
[[override]]
name = "github.com/gorilla/mux"
revision = "599cba5e7b6137d46ddf58fb1765f5d928e69604"
[[override]]
name = "github.com/imdario/mergo"
revision = "50d4dbd4eb0e84778abe37cefef140271d96fade"
[[override]]
name = "github.com/jonboulle/clockwork"
revision = "e3653ace2d63753697e0e5b07b9393971c0bba9d"
[[override]]
name = "github.com/juju/ratelimit"
revision = "77ed1c8a01217656d2080ad51981f6e99adaa177"
[[override]]
name = "github.com/minio/go-homedir"
revision = "21304a94172ae3a09dee2cd86a12fb6f842138c7"
[[override]]
name = "github.com/opencontainers/runc"
revision = "94dc520a5732126985fec249f80c91b9e0601815"
[[override]]
name = "github.com/opencontainers/runtime-spec"
revision = "313f40bdfcc04c6b0f7b8a8c3e91a7b7a3a0ef4e"
[[override]]
name = "github.com/pborman/uuid"
revision = "c55201b036063326c5b1b89ccfe45a184973d073"
[[override]]
name = "github.com/prometheus/common"
revision = "ebdfc6da46522d58825777cf1f90490a5b1ef1d8"
[[override]]
name = "github.com/prometheus/procfs"
revision = "abf152e5f3e97f2fafac028d2cc06c1feb87ffa5"
[[override]]
name = "github.com/spf13/pflag"
revision = "4f9190456aed1c2113ca51ea9b89219747458dc1"
[[override]]
name = "github.com/stretchr/objx"
revision = "cbeaeb16a013161a98496fad62933b1d21786672"
[[override]]
name = "github.com/ugorji/go"
revision = "4a1cb5252a6951f715a85d0e4be334c2a2dbf2a2"
[[override]]
name = "github.com/vbatts/tar-split"
revision = "bd4c5d64c3e9297f410025a3b1bd0c58f659e721"
[[override]]
name = "golang.org/x/oauth2"
revision = "3b966c7f301c0c71c53d94dc632a62df0a682cd7"
[[override]]
name = "golang.org/x/sys"
revision = "042a8f53ce82bbe081222da955159491e32146a0"
[[override]]
name = "google.golang.org/appengine"
revision = "e951d3868b377b14f4e60efa3a301532ee3c1ebf"
......@@ -55,11 +55,10 @@ export CGO_ENABLED ?= 0
# Development Tools
GOVENDOR = $(GOPATH_BIN)/govendor
GOX = $(GOPATH_BIN)/gox
GOBINDATA = $(GOPATH_BIN)/go-bindata
MOCKERY = $(GOPATH_BIN)/mockery
DEVELOPMENT_TOOLS = $(GOVENDOR) $(GOX) $(GOBINDATA) $(MOCKERY)
DEVELOPMENT_TOOLS = $(GOX) $(GOBINDATA) $(MOCKERY)
MOCKERY_FLAGS = -note="This comment works around https://github.com/vektra/mockery/issues/155"
......@@ -398,10 +397,6 @@ development_setup:
if prlctl --version ; then $(MAKE) -C tests/ubuntu parallels ; fi
if vboxmanage --version ; then $(MAKE) -C tests/ubuntu virtualbox ; fi
update_govendor_dependencies: $(GOVENDOR)
# updating vendor/ dependencies
@./scripts/update-govendor-dependencies
# local GOPATH
$(GOPATH_SETUP): $(PKG_BUILD_DIR)
mkdir -p $(GOPATH_BIN)
......@@ -412,9 +407,6 @@ $(PKG_BUILD_DIR):
ln -s ../../../.. $@
# development tools
$(GOVENDOR): $(GOPATH_SETUP)
go get github.com/kardianos/govendor
$(GOX): $(GOPATH_SETUP)
go get github.com/mitchellh/gox
......
......@@ -150,55 +150,14 @@ You can start hacking GitLab-Runner code. If you are interested you can use Inte
## Managing build dependencies
GitLab Runner uses [Govendor](https://github.com/kardianos/govendor) to manage
GitLab Runner uses [dep](https://github.com/golang/dep) to manage
its dependencies - they get checked into the repository under the `vendor/` directory,
with a manifest stored in `vendor/vendor.json`.
with a manifest stored in `Godep.toml` and in `Godep.lock` lockfile.
If your contribution adds, removes or updates any dependencies to the runner,
please ensure the vendored copies updated in lock-step.
please ensure the vendored copies is updated with the appropriate `dep ensure` command.
**For added/removed dependencies:**
1. Run `go get [package]` (if you haven't done this already) to download required package into your `$GOPATH`.
Repeat this for any added package.
1. Commit all added changes and stash/remove all uncommited changes to have a clean working directory.
1. Execute
```bash
$ make update_govendor_dependencies
```
This task will:
* remove all unused packages with,
* add all missing or external packages (packages that are not stored in vendor but can be found in `$GOPATH`),
* show git status and ask if changes in `vendor/` or done properly,
* show diff of `vendor/vendor.json` and ask if it is done properly,
* add and commit changes in `vendor/` directory.
**For dependencies that need update:**
1. Run `go get -u [package]` (if you haven't done this already) to upload selected package present in your `$GOPATH`
or download it if it's not present.
If you want to use specific version then go to the package directory in your `$GOPATH` and checkout it to this
version, e.g.:
```bash
$ cd $GOPATH/src/github.com/docker/docker/client
$ git checkout v1.13.0
```
Repeat this for any added package.
1. Execute
```bash
$ make update_govendor_dependencies
```
This task will behave just like described above.
Don't add dependency from upstream master branch when version tags are available.
## Troubleshooting
......
#!/bin/bash
set -e
confirm_changes() {
echo -e "\nDoes this look OK [yes/no]? "
read -e input
input=$(echo "${input}" | tr '[:upper:]' '[:lower:]')
if [ "${input}" != "yes" ]; then
exit 1
fi
}
gitWorkdirStatus=$(git status --porcelain | grep -v -e "vendor/" -e scripts/update-govendor-dependencies || echo '')
if [[ -n "${gitWorkdirStatus}" ]]; then
echo "Your git working directory contains uncommited changes and/or untracked files"
echo "Please cleanup your working directory (commit, stash or remove changes) before updating govendor dependencies"
fi
echo "Removing unused packages"
govendor remove +unused
echo "Adding missing and external packages"
for package in $(govendor list --no-status +outside | grep -v "^appengine"); do
echo "Updating ${package}..."
govendor add ${package}
done
echo -e "\nChanges in vendor/"
git status --short
confirm_changes
echo -e "\nDiff of vendor/vendor.json"
git diff vendor/vendor.json
confirm_changes
git add vendor/
git commit -m "Updating govendor dependencies"
\ No newline at end of file
......@@ -174,3 +174,28 @@
of your accepting any such warranty or additional liability.
END OF TERMS AND CONDITIONS
APPENDIX: How to apply the Apache License to your work.
To apply the Apache License to your work, attach the following
boilerplate notice, with the fields enclosed by brackets "[]"
replaced with your own identifying information. (Don't include
the brackets!) The text should be enclosed in the appropriate
comment syntax for the file format. We also recommend that a
file or class name and description of purpose be included on the
same "printed page" as the copyright notice for easier
identification within third-party archives.
Copyright [yyyy] [name of copyright owner]
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
\ No newline at end of file
[![Build Status](https://travis-ci.org/cloudfoundry-incubator/candiedyaml.svg)](https://travis-ci.org/cloudfoundry-incubator/candiedyaml)
[![GoDoc](https://godoc.org/github.com/cloudfoundry-incubator/candiedyaml?status.svg)](https://godoc.org/github.com/cloudfoundry-incubator/candiedyaml)
candiedyaml
===========
-----
DEPRECATION NOTICE
------------------
The `candiedyaml` library is no longer under active development and will soon
be moved to the [cloudfoundry-attic](https://github.com/cloudfoundry-attic)
GitHub organization. We recommend the use of an alternative library such as
[`gopkg.in/yaml.v2`](https://gopkg.in/yaml.v2) instead.
-----
YAML for Go
A YAML 1.1 parser with support for YAML 1.2 features
......
......@@ -16,4 +16,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
\ No newline at end of file
SOFTWARE.
all:
cover:
go test -cover -v -coverprofile=cover.dat ./...
go tool cover -func cover.dat
.PHONY: cover
This diff is collapsed.
The Prometheus project was started by Matt T. Proud (emeritus) and
Julius Volz in 2012.
Maintainers of this repository:
* Björn Rabenstein <beorn@soundcloud.com>
The following individuals have contributed code to this repository
(listed in alphabetical order):
* Björn Rabenstein <beorn@soundcloud.com>
* Matt T. Proud <matt.proud@gmail.com>
* Tobias Schmidt <ts@soundcloud.com>
# This is the official list of cloud authors for copyright purposes.
# This file is distinct from the CONTRIBUTORS files.
# See the latter for an explanation.
# Names should be added to this file as:
# Name or Organization <email address>
# The email address is not required for organizations.
Filippo Valsorda <hi@filippo.io>
Google Inc.
Ingo Oeser <nightlyone@googlemail.com>
Palm Stone Games, Inc.
Paweł Knap <pawelknap88@gmail.com>
Péter Szilágyi <peterke@gmail.com>
Tyler Treat <ttreat31@gmail.com>
# People who have agreed to one of the CLAs and can contribute patches.
# The AUTHORS file lists the copyright holders; this file
# lists people. For example, Google employees are listed here
# but not in AUTHORS, because Google holds the copyright.
#
# https://developers.google.com/open-source/cla/individual
# https://developers.google.com/open-source/cla/corporate
#
# Names should be added to this file as:
# Name <email address>
# Keep the list alphabetically sorted.
Alexis Hunt <lexer@google.com>
Andreas Litt <andreas.litt@gmail.com>
Andrew Gerrand <adg@golang.org>
Brad Fitzpatrick <bradfitz@golang.org>
Burcu Dogan <jbd@google.com>
Dave Day <djd@golang.org>
David Sansome <me@davidsansome.com>
David Symonds <dsymonds@golang.org>
Filippo Valsorda <hi@filippo.io>
Glenn Lewis <gmlewis@google.com>
Ingo Oeser <nightlyone@googlemail.com>
Johan Euphrosine <proppy@google.com>
Jonathan Amsterdam <jba@google.com>
Luna Duclos <luna.duclos@palmstonegames.com>
Michael McGreevy <mcgreevy@golang.org>
Omar Jarjur <ojarjur@google.com>
Paweł Knap <pawelknap88@gmail.com>
Péter Szilágyi <peterke@gmail.com>
Sarah Adams <shadams@google.com>
Toby Burress <kurin@google.com>
Tuo Shan <shantuo@google.com>
Tyler Treat <ttreat31@gmail.com>
This diff is collapsed.
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment