Skip to content

Commit

Permalink
Migrate to go dep (#640)
Browse files Browse the repository at this point in the history
* dont update deps

* migrate to go dep

* makefile fixes
  • Loading branch information
c0ze committed Aug 27, 2017
1 parent 32278fe commit 2e54af3
Show file tree
Hide file tree
Showing 9 changed files with 700 additions and 1,051 deletions.
501 changes: 501 additions & 0 deletions Gopkg.lock

Large diffs are not rendered by default.

192 changes: 192 additions & 0 deletions Gopkg.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,192 @@

## Gopkg.toml example (these lines may be deleted)

## "required" lists a set of packages (not projects) that must be included in
## Gopkg.lock. This list is merged with the set of packages imported by the current
## project. Use it when your project needs a package it doesn't explicitly import -
## including "main" packages.
# required = ["github.com/user/thing/cmd/thing"]

## "ignored" lists a set of packages (not projects) that are ignored when
## dep statically analyzes source code. Ignored packages can be in this project,
## or in a dependency.
# ignored = ["github.com/user/project/badpkg"]

## Dependencies define constraints on dependent projects. They are respected by
## dep whether coming from the Gopkg.toml of the current project or a dependency.
# [[dependencies]]
## Required: the root import path of the project being constrained.
# name = "github.com/user/project"
#
## Recommended: the version constraint to enforce for the project.
## Only one of "branch", "version" or "revision" can be specified.
# version = "1.0.0"
# branch = "master"
# revision = "abc123"
#
## Optional: an alternate location (URL or import path) for the project's source.
# source = "https://github.com/myfork/package.git"

## Overrides have the same structure as [[dependencies]], but supercede all
## [[dependencies]] declarations from all projects. Only the current project's
## [[overrides]] are applied.
##
## Overrides are a sledgehammer. Use them only as a last resort.
# [[overrides]]
## Required: the root import path of the project being constrained.
# name = "github.com/user/project"
#
## Optional: specifying a version constraint override will cause all other
## constraints on this project to be ignored; only the overriden constraint
## need be satisfied.
## Again, only one of "branch", "version" or "revision" can be specified.
# version = "1.0.0"
# branch = "master"
# revision = "abc123"
#
## Optional: specifying an alternate source location as an override will
## enforce that the alternate location is used for that project, regardless of
## what source location any dependent projects specify.
# source = "https://github.com/myfork/package.git"



[[dependencies]]
name = "github.com/Sirupsen/logrus"
version = "^0.11.5"

[[dependencies]]
name = "github.com/aws/aws-sdk-go"
version = "^1.8.30"

[[dependencies]]
branch = "master"
name = "github.com/boltdb/bolt"

[[dependencies]]
name = "github.com/ccirello/supervisor"
version = "^0.5.3"

[[dependencies]]
branch = "master"
name = "github.com/dghubble/go-twitter"

[[dependencies]]
name = "github.com/dghubble/oauth1"
version = "^0.4.0"

[[dependencies]]
name = "github.com/dgrijalva/jwt-go"
version = "^3.0.0"

[[dependencies]]
name = "github.com/docker/docker"
version = "^17.5.0-ce-rc3"

[[dependencies]]
branch = "master"
name = "github.com/fsouza/go-dockerclient"

[[dependencies]]
name = "github.com/garyburd/redigo"
version = "^1.1.0"

[[dependencies]]
name = "github.com/giantswarm/semver-bump"
version = "^1.1.1"

[[dependencies]]
name = "github.com/gin-gonic/gin"
version = "^1.1.4"

[[dependencies]]
branch = "master"
name = "github.com/go-openapi/errors"

[[dependencies]]
branch = "master"
name = "github.com/go-openapi/loads"

[[dependencies]]
branch = "master"
name = "github.com/go-openapi/runtime"

[[dependencies]]
branch = "master"
name = "github.com/go-openapi/spec"

[[dependencies]]
branch = "master"
name = "github.com/go-openapi/strfmt"

[[dependencies]]
branch = "master"
name = "github.com/go-openapi/swag"

[[dependencies]]
branch = "master"
name = "github.com/go-openapi/validate"

[[dependencies]]
name = "github.com/go-sql-driver/mysql"
version = "^1.3.0"

[[dependencies]]
branch = "master"
name = "github.com/golang/groupcache"

[[dependencies]]
branch = "master"
name = "github.com/google/btree"

[[dependencies]]
branch = "master"
name = "github.com/iron-io/functions_go"

[[dependencies]]
branch = "master"
name = "github.com/iron-io/iron_go3"

[[dependencies]]
branch = "master"
name = "github.com/iron-io/runner"

[[dependencies]]
branch = "master"
name = "github.com/jmoiron/jsonq"

[[dependencies]]
branch = "master"
name = "github.com/lib/pq"

[[dependencies]]
branch = "master"
name = "github.com/pkg/errors"

[[dependencies]]
name = "github.com/satori/go.uuid"
version = "^1.1.0"

[[dependencies]]
branch = "master"
name = "github.com/spf13/viper"

[[dependencies]]
name = "github.com/urfave/cli"
version = "^1.19.1"

[[dependencies]]
branch = "master"
name = "golang.org/x/crypto"

[[dependencies]]
branch = "master"
name = "golang.org/x/sys"

[[dependencies]]
branch = "v2"
name = "gopkg.in/mgo.v2"

[[dependencies]]
branch = "v2"
name = "gopkg.in/yaml.v2"
6 changes: 1 addition & 5 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
.PHONY: all test dep build

dep:
dep ensure --update
dep ensure

build:
go build -o functions
Expand All @@ -23,10 +23,6 @@ test-build-arm:
run:
./functions

docker-dep:
# todo: need to create a dep tool image for this (or just ditch this)
docker run --rm -it -v ${CURDIR}:/go/src/github.com/iron-io/functions -w /go/src/github.com/iron-io/functions treeder/glide install -v

docker-build:
docker run --rm -v ${CURDIR}:/go/src/github.com/iron-io/functions -w /go/src/github.com/iron-io/functions iron/go:dev go build -o functions-alpine
docker build -t iron/functions:latest .
Expand Down
10 changes: 5 additions & 5 deletions fn/Makefile
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
all: vendor build
all: vendor build
./fn

build:
build:
go build -o fn

docker: vendor
GOOS=linux go build -o fn
docker build -t iron/fn .
docker push iron/fn

vendor:
dep ensure --update
dep:
dep ensure

test:
go test $(go list ./... | grep -v /vendor/)
Expand All @@ -22,4 +22,4 @@ release:

# install locally
install: build
sudo mv fn /usr/local/bin/
sudo mv fn /usr/local/bin/
Loading

0 comments on commit 2e54af3

Please sign in to comment.