misc: Remove glide and use dep

Since glide is deprecated as a dependency manager for go
project and dep is now officially supported so it would
be a good idea to move to dep
This commit is contained in:
Jinank Jain 2017-12-31 14:17:47 -06:00
parent 81fbed5acf
commit ba3694a23b
5 changed files with 141 additions and 97 deletions

View File

@ -8,7 +8,7 @@ go:
- 1.9
install:
- go get github.com/Masterminds/glide
- go get github.com/golang/dep/cmd/dep
- go get github.com/golang/lint/golint
script:
@ -17,13 +17,13 @@ script:
# want the arch to change, we have to do this layer of
# indirection. Blargh.
- export GOARCH=$MY_GOARCH
- glide install
- dep ensure
# Try to build on all architectures.
- go install ./cmd/pixiecore
# Only do testing and things that requires stuff to be executable on amd64.
- "if [ \"$GOARCH\" = \"amd64\" ]; then go test $(glide novendor); fi"
- "if [ \"$GOARCH\" = \"amd64\" ]; then go vet $(glide novendor); fi"
- "if [ \"$GOARCH\" = \"amd64\" ]; then glide novendor | xargs -n1 golint; fi"
- "if [ \"$GOARCH\" = \"amd64\" ]; then go test $(go list ./... | grep -v /vendor/); fi"
- "if [ \"$GOARCH\" = \"amd64\" ]; then go vet $(go list ./... | grep -v /vendor/); fi"
- "if [ \"$GOARCH\" = \"amd64\" ]; then go list ./... | grep -v /vendor/ | xargs -n1 golint; fi"
jobs:
@ -33,10 +33,10 @@ jobs:
env:
- NAME=debian_packages
install:
- go get github.com/Masterminds/glide
- go get github.com/golang/dep/cmd/dep
- gem install fpm
script:
- glide install
- dep ensure
- GOARCH=amd64 go build -o pixiecore.amd64 ./cmd/pixiecore
- GOARCH=arm go build -o pixiecore.arm ./cmd/pixiecore
- fpm -s dir -t deb -n pixiecore -v $(date '+%Y%m%d%H%M%S')

117
Gopkg.lock generated Normal file
View File

@ -0,0 +1,117 @@
# This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'.
[[projects]]
name = "github.com/fsnotify/fsnotify"
packages = ["."]
revision = "629574ca2a5df945712d3079857300b5e4da0236"
version = "v1.4.2"
[[projects]]
branch = "master"
name = "github.com/hashicorp/hcl"
packages = [".","hcl/ast","hcl/parser","hcl/scanner","hcl/strconv","hcl/token","json/parser","json/scanner","json/token"]
revision = "23c074d0eceb2b8a5bfdbb271ab780cde70f05a8"
[[projects]]
name = "github.com/inconshreveable/mousetrap"
packages = ["."]
revision = "76626ae9c91c4f2a10f34cad8ce83ea42c93bb75"
version = "v1.0"
[[projects]]
name = "github.com/magiconair/properties"
packages = ["."]
revision = "d419a98cdbed11a922bf76f257b7c4be79b50e73"
version = "v1.7.4"
[[projects]]
branch = "master"
name = "github.com/mitchellh/mapstructure"
packages = ["."]
revision = "06020f85339e21b2478f756a78e295255ffa4d6a"
[[projects]]
name = "github.com/pelletier/go-toml"
packages = ["."]
revision = "16398bac157da96aa88f98a2df640c7f32af1da2"
version = "v1.0.1"
[[projects]]
name = "github.com/spf13/afero"
packages = [".","mem"]
revision = "ec3a3111d1e1bdff38a61e09d5a5f5e974905611"
version = "v1.0.1"
[[projects]]
name = "github.com/spf13/cast"
packages = ["."]
revision = "acbeb36b902d72a7a4c18e8f3241075e7ab763e4"
version = "v1.1.0"
[[projects]]
name = "github.com/spf13/cobra"
packages = ["."]
revision = "7b2c5ac9fc04fc5efafb60700713d4fa609b777b"
version = "v0.0.1"
[[projects]]
branch = "master"
name = "github.com/spf13/jwalterweatherman"
packages = ["."]
revision = "12bd96e66386c1960ab0f74ced1362f66f552f7b"
[[projects]]
name = "github.com/spf13/pflag"
packages = ["."]
revision = "e57e3eeb33f795204c1ca35f56c44f83227c6e66"
version = "v1.0.0"
[[projects]]
name = "github.com/spf13/viper"
packages = ["."]
revision = "25b30aa063fc18e48662b86996252eabdcf2f0c7"
version = "v1.0.0"
[[projects]]
branch = "master"
name = "go.universe.tf/netboot"
packages = ["dhcp4","pixiecore","pixiecore/cli","tftp","third_party/ipxe"]
revision = "81fbed5acf561320d856017efdd7b593e62d8539"
[[projects]]
branch = "master"
name = "golang.org/x/crypto"
packages = ["nacl/secretbox","poly1305","salsa20/salsa"]
revision = "95a4943f35d008beabde8c11e5075a1b714e6419"
[[projects]]
branch = "master"
name = "golang.org/x/net"
packages = ["bpf","icmp","internal/iana","internal/socket","ipv4","ipv6"]
revision = "d866cfc389cec985d6fda2859936a575a55a3ab6"
[[projects]]
branch = "master"
name = "golang.org/x/sys"
packages = ["unix"]
revision = "83801418e1b59fb1880e363299581ee543af32ca"
[[projects]]
branch = "master"
name = "golang.org/x/text"
packages = ["internal/gen","internal/triegen","internal/ucd","transform","unicode/cldr","unicode/norm"]
revision = "e19ae1496984b1c655b8044a65c0300a3c878dd3"
[[projects]]
branch = "v2"
name = "gopkg.in/yaml.v2"
packages = ["."]
revision = "287cf08546ab5e7e37d55a84f7ed3fd1db036de5"
[solve-meta]
analyzer-name = "dep"
analyzer-version = 1
inputs-digest = "1349f12d1e12c3a4b34929f194c446faf1650f0602c20e0c2a81375d12fa1af3"
solver-name = "gps-cdcl"
solver-version = 1

17
Gopkg.toml Normal file
View File

@ -0,0 +1,17 @@
[[constraint]]
name = "github.com/spf13/cobra"
branch = "master"
[[constraint]]
name = "github.com/spf13/viper"
branch = "master"
[[constraint]]
name = "golang.org/x/crypto"
[[constraint]]
name = "golang.org/x/net"
[[constraint]]
name = "github.com/google/go-cmp"
version = "^0.1.0"

73
glide.lock generated
View File

@ -1,73 +0,0 @@
hash: 793ba6396344241f612f1b186abc43fce3b4f6f4efd5f941ba708e038602865a
updated: 2017-12-24T17:29:58.7960062-08:00
imports:
- name: github.com/fsnotify/fsnotify
version: 4da3e2cfbabc9f751898f250b49f2439785783a1
- name: github.com/hashicorp/hcl
version: 23c074d0eceb2b8a5bfdbb271ab780cde70f05a8
subpackages:
- hcl/ast
- hcl/parser
- hcl/printer
- hcl/scanner
- hcl/strconv
- hcl/token
- json/parser
- json/scanner
- json/token
- name: github.com/inconshreveable/mousetrap
version: 76626ae9c91c4f2a10f34cad8ce83ea42c93bb75
- name: github.com/magiconair/properties
version: 49d762b9817ba1c2e9d0c69183c2b4a8b8f1d934
- name: github.com/mitchellh/mapstructure
version: 06020f85339e21b2478f756a78e295255ffa4d6a
- name: github.com/pelletier/go-toml
version: 0131db6d737cfbbfb678f8b7d92e55e27ce46224
- name: github.com/spf13/afero
version: 8d919cbe7e2627e417f3e45c3c0e489a5b7e2536
subpackages:
- mem
- name: github.com/spf13/cast
version: acbeb36b902d72a7a4c18e8f3241075e7ab763e4
- name: github.com/spf13/cobra
version: ccaecb155a2177302cb56cae929251a256d0f646
- name: github.com/spf13/jwalterweatherman
version: 12bd96e66386c1960ab0f74ced1362f66f552f7b
- name: github.com/spf13/pflag
version: 4c012f6dcd9546820e378d0bdda4d8fc772cdfea
- name: github.com/spf13/viper
version: 1a0c4a370c3e8286b835467d2dfcdaf636c3538b
- name: golang.org/x/crypto
version: d585fd2cc9195196078f516b69daff6744ef5e84
subpackages:
- nacl/secretbox
- poly1305
- salsa20/salsa
- name: golang.org/x/net
version: d866cfc389cec985d6fda2859936a575a55a3ab6
subpackages:
- bpf
- icmp
- internal/iana
- internal/socket
- ipv4
- ipv6
- name: golang.org/x/sys
version: 83801418e1b59fb1880e363299581ee543af32ca
subpackages:
- unix
- name: golang.org/x/text
version: eb22672bea55af56d225d4e35405f4d2e9f062a0
subpackages:
- transform
- unicode/norm
- name: gopkg.in/yaml.v2
version: 287cf08546ab5e7e37d55a84f7ed3fd1db036de5
testImports:
- name: github.com/google/go-cmp
version: 8099a9787ce5dc5984ed879a3bda47dc730a8e97
subpackages:
- cmp
- cmp/internal/diff
- cmp/internal/function
- cmp/internal/value

View File

@ -1,17 +0,0 @@
package: go.universe.tf/netboot
import:
- package: github.com/spf13/cobra
- package: github.com/spf13/viper
- package: golang.org/x/crypto
subpackages:
- nacl/secretbox
- package: golang.org/x/net
subpackages:
- bpf
- icmp
- ipv4
testImport:
- package: github.com/google/go-cmp
version: ^0.1.0
subpackages:
- cmp