Skip to content

Commit

Permalink
Merge pull request #13 from Clever/go-modules
Browse files Browse the repository at this point in the history
[automated] Migrate from dep to go mod
  • Loading branch information
taylor-sutton authored Jul 15, 2021
2 parents c1126b9 + d520240 commit 7d75b92
Show file tree
Hide file tree
Showing 9 changed files with 377 additions and 358 deletions.
6 changes: 6 additions & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ jobs:
docker:
- image: circleci/golang:1.13-stretch
environment:
GOPRIVATE: github.com/Clever/*
CIRCLE_ARTIFACTS: /tmp/circleci-artifacts
CIRCLE_TEST_REPORTS: /tmp/circleci-test-results
steps:
Expand All @@ -16,6 +17,11 @@ jobs:
- run:
command: mkdir -p $CIRCLE_ARTIFACTS $CIRCLE_TEST_REPORTS
name: Set up CircleCI artifacts directories
- run:
command: git config --global "url.ssh://[email protected]/Clever".insteadOf "https://github.com/Clever"
- run:
name: Add github.com to known hosts
command: mkdir -p ~/.ssh && touch ~/.ssh/known_hosts && echo 'github.com ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAq2A7hRGmdnm9tUDbO9IDSwBK6TbQa+PXYPCPy6rbTrTtw7PHkccKrpp0yVhp5HdEIcKr6pLlVDBfOLX9QUsyCOV0wzfjIJNlGEYsdlLJizHhbn2mUjvSAHQqZETYP81eFzLQNnPHt4EVVUh7VfDESU84KezmD5QlWpXLmvU31/yMf+Se8xhHTvKSCZIFImWwoG6mbUoWf9nzpIoaSjB+weqqUUmpaaasXVal72J+UX2B+2RPW3RcT0eOzQgqlJL3RKrTJvdsjE3JEAvGq3lGHSZXy28G3skua2SmVi/w4yCE6gbODqnTWlg7+wC604ydGXA8VJiS5ap43JXiUFFAaQ==' >> ~/.ssh/known_hosts
- run: make install_deps
- run: make test
- run: if [ "${CIRCLE_BRANCH}" == "master" ]; then $HOME/ci-scripts/circleci/github-release $GH_RELEASE_TOKEN; fi;
268 changes: 0 additions & 268 deletions Gopkg.lock

This file was deleted.

31 changes: 0 additions & 31 deletions Gopkg.toml

This file was deleted.

8 changes: 4 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ include golang.mk
.PHONY: test $(PKGS)
SHELL := /bin/bash

PKGS = $(shell go list ./...)
PKGS = $(shell go list ./... | grep -v /vendor | grep -v /tools)
$(eval $(call golang-version-check,1.13))

export _DEPLOY_ENV=testing
Expand All @@ -15,11 +15,11 @@ $(PKGS): golang-test-all-strict-deps
go generate $@
$(call golang-test-all-strict,$@)

install_deps: golang-dep-vendor-deps
install_deps:
go mod vendor
go get -u github.com/golang/mock/gomock
go get -u github.com/golang/mock/mockgen
$(call golang-dep-vendor)

generate:
go generate ./...
go generate ./vendor/github.com/Clever/analytics-latency-config-service/gen-go/client
go generate ./vendor/github.com/Clever/analytics-latency-config-service/gen-go/client/interface.go
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.2.1
1.3.0
28 changes: 28 additions & 0 deletions go.mod
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
module github.com/Clever/analytics-util

go 1.13

require (
github.com/Clever/analytics-latency-config-service v0.2.1
github.com/Clever/discovery-go v1.7.2 // indirect
github.com/afex/hystrix-go v0.0.0-20180502004556-fa1af6a1f4f5 // indirect
github.com/asaskevich/govalidator v0.0.0-20200817114649-df4adffc9d8c // indirect
github.com/donovanhide/eventsource v0.0.0-20171031113327-3ed64d21fb0b // indirect
github.com/go-openapi/runtime v0.19.22 // indirect
github.com/go-openapi/spec v0.19.9 // indirect
github.com/go-openapi/validate v0.19.11 // indirect
github.com/golang/mock v1.6.0
github.com/google/go-cmp v0.5.4 // indirect
github.com/mailru/easyjson v0.7.6 // indirect
github.com/mitchellh/mapstructure v1.3.3 // indirect
github.com/opentracing/opentracing-go v1.2.0 // indirect
github.com/smartystreets/goconvey v1.6.4 // indirect
github.com/stretchr/testify v1.6.1
github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
github.com/xeipuuv/gojsonschema v1.2.1-0.20200424115421-065759f9c3d7 // indirect
go.mongodb.org/mongo-driver v1.4.1 // indirect
golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c // indirect
golang.org/x/tools v0.1.5 // indirect
gopkg.in/Clever/kayvee-go.v6 v6.24.0
gopkg.in/yaml.v2 v2.3.1-0.20200602174213-b893565b90ca // indirect
)
Loading

0 comments on commit 7d75b92

Please sign in to comment.