From 16c93bc98fd53500086e22174a029e1fe9f8bd42 Mon Sep 17 00:00:00 2001 From: Sean Sube Date: Sat, 10 Mar 2018 10:25:15 -0600 Subject: [PATCH] use dep for dependencies, update build --- .gitignore | 6 ++- .gitlab-ci.yml | 8 ++-- Gopkg.lock | 65 +++++++++++++++++++++++++++++++++ Gopkg.toml | 42 +++++++++++++++++++++ src/home-dns/main.go => main.go | 0 5 files changed, 115 insertions(+), 6 deletions(-) create mode 100644 Gopkg.lock create mode 100644 Gopkg.toml rename src/home-dns/main.go => main.go (100%) diff --git a/.gitignore b/.gitignore index 13f884d..1389f0b 100644 --- a/.gitignore +++ b/.gitignore @@ -16,8 +16,10 @@ # Misc Go bin/ pkg/ -src/github.com/ -src/gopkg.in/ +vendor/ # Config files config.yml + +# Output +home-dns diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index eb73fb6..944da51 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -5,15 +5,15 @@ stages: build:app: stage: build - image: golang:1.9 + image: andrexus/golang-dep tags: - runner:k8s script: - - go get home-dns - - go build home-dns + - dep ensure + - go build artifacts: paths: - - bin/home-dns + - home-dns expire_in: 1 hour cache: key: "${CI_COMMIT_REF_SLUG}" diff --git a/Gopkg.lock b/Gopkg.lock new file mode 100644 index 0000000..c1abd97 --- /dev/null +++ b/Gopkg.lock @@ -0,0 +1,65 @@ +# This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'. + + +[[projects]] + name = "github.com/aws/aws-sdk-go" + packages = [ + "aws", + "aws/awserr", + "aws/awsutil", + "aws/client", + "aws/client/metadata", + "aws/corehandlers", + "aws/credentials", + "aws/credentials/ec2rolecreds", + "aws/credentials/endpointcreds", + "aws/credentials/stscreds", + "aws/defaults", + "aws/ec2metadata", + "aws/endpoints", + "aws/request", + "aws/session", + "aws/signer/v4", + "internal/sdkrand", + "internal/shareddefaults", + "private/protocol", + "private/protocol/query", + "private/protocol/query/queryutil", + "private/protocol/rest", + "private/protocol/restxml", + "private/protocol/xml/xmlutil", + "service/route53", + "service/sts" + ] + revision = "bafcd9ccc717e9bc5406acaea370577299223873" + version = "v1.13.11" + +[[projects]] + name = "github.com/go-ini/ini" + packages = ["."] + revision = "6333e38ac20b8949a8dd68baa3650f4dee8f39f0" + version = "v1.33.0" + +[[projects]] + name = "github.com/jmespath/go-jmespath" + packages = ["."] + revision = "0b12d6b5" + +[[projects]] + branch = "v2" + name = "gopkg.in/robfig/cron.v2" + packages = ["."] + revision = "be2e0b0deed5a68ffee390b4583a13aff8321535" + +[[projects]] + name = "gopkg.in/yaml.v2" + packages = ["."] + revision = "7f97868eec74b32b0982dd158a51a446d1da7eb5" + version = "v2.1.1" + +[solve-meta] + analyzer-name = "dep" + analyzer-version = 1 + inputs-digest = "b2c084d6a7f76418ec9246e77a9dbc09cb418ef48585264227296f89996534b5" + solver-name = "gps-cdcl" + solver-version = 1 diff --git a/Gopkg.toml b/Gopkg.toml new file mode 100644 index 0000000..868e3a2 --- /dev/null +++ b/Gopkg.toml @@ -0,0 +1,42 @@ +# 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" +# +# [prune] +# non-go = false +# go-tests = true +# unused-packages = true + + +[[constraint]] + name = "github.com/aws/aws-sdk-go" + version = "1.13.11" + +[[constraint]] + branch = "v2" + name = "gopkg.in/robfig/cron.v2" + +[[constraint]] + name = "gopkg.in/yaml.v2" + version = "2.1.1" + +[prune] + go-tests = true + unused-packages = true diff --git a/src/home-dns/main.go b/main.go similarity index 100% rename from src/home-dns/main.go rename to main.go