diff --git a/.travis.yml b/.travis.yml index 78ad7277..0556ae0d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,8 +1,8 @@ language: go go: - - "1.10" + - "1.12" jobs: include: - - stage: Test and build + - stage: Test and Build script: - REVISION=${TRAVIS_COMMIT::7} make test && docker run -e BUILD_ARCH=amd64 -e REVISION=${TRAVIS_COMMIT::7} -e GIT_TAG=$(git describe --abbrev=0 --tags) -e DIST_DIR=/upload -v $(pwd)/_dist/:/upload --rm quay.io/deisci/workflow-cli-dev:${TRAVIS_COMMIT::7} make build-all + REVISION=${TRAVIS_COMMIT::7} make test && docker run -e BUILD_ARCH=amd64 -e REVISION=${TRAVIS_COMMIT::7} -e GIT_TAG=$(git describe --abbrev=0 --tags) -e DIST_DIR=/upload -v $(pwd)/_dist/:/upload --rm hephy/workflow-cli-dev:${TRAVIS_COMMIT::7} make build-all diff --git a/Dockerfile b/Dockerfile index 92d7ef24..1638d9db 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM hephy/go-dev:v0.22.0 +FROM hephy/go-dev:v1.27.1 # This Dockerfile is used to bundle the source and all dependencies into an image for testing. RUN echo "deb http://packages.cloud.google.com/apt cloud-sdk-jessie main" \ @@ -15,13 +15,12 @@ ENV CGO_ENABLED=0 ADD https://codecov.io/bash /usr/local/bin/codecov RUN chmod +x /usr/local/bin/codecov -COPY glide.yaml /go/src/github.com/teamhephy/workflow-cli/ -COPY glide.lock /go/src/github.com/teamhephy/workflow-cli/ - WORKDIR /go/src/github.com/teamhephy/workflow-cli -RUN glide install --strip-vendor +ENV GO111MODULE=on COPY ./_scripts /usr/local/bin COPY . /go/src/github.com/teamhephy/workflow-cli + +RUN go build diff --git a/Makefile b/Makefile index 0cca5a32..8a2137ad 100644 --- a/Makefile +++ b/Makefile @@ -12,8 +12,8 @@ endif GIT_TAG ?= $(shell git describe --abbrev=0 --tags) REVISION ?= $(shell git rev-parse --short HEAD) -REGISTRY ?= quay.io/ -IMAGE_PREFIX ?= deisci +REGISTRY ?= +IMAGE_PREFIX ?= hephy IMAGE := ${REGISTRY}${IMAGE_PREFIX}/workflow-cli-dev:${REVISION} BUILD_OS ?=linux darwin windows diff --git a/glide.lock b/glide.lock deleted file mode 100644 index 785d19cd..00000000 --- a/glide.lock +++ /dev/null @@ -1,65 +0,0 @@ -hash: 9644c42725b5eacf54615aeddfdee0cf7fad7398947f7a5088ca58ea7cf73fa1 -updated: 2019-03-20T10:59:24.091458096-04:00 -imports: -- name: github.com/arschles/assert - version: bb58b908265b5931732079df03f2818bf2167ba0 -- name: github.com/docopt/docopt-go - version: ee0de3bc6815ee19d4a46c7eb90f829db0e014b1 -- name: github.com/goware/urlx - version: 4fc201f7f862af2abfaca0c2904be15ea0037a34 -- name: github.com/mattn/go-runewidth - version: 703b5e6b11ae25aeb2af9ebb5d5fdf8fa2575211 -- name: github.com/olekukonko/tablewriter - version: f82d31373321de71ad0289113725564fe180a301 -- name: github.com/PuerkitoBio/purell - version: 44968752391892e1b0d0b821ee79e9a85fa13049 -- name: github.com/PuerkitoBio/urlesc - version: de5bf2ad457846296e2031421a34e2568e304e35 -- name: github.com/teamhephy/controller-sdk-go - version: a1ffb4886a5f7f92fdd710b99e68c2555b74a703 - subpackages: - - api - - apps - - appsettings - - auth - - builds - - certs - - config - - domains - - keys - - perms - - pkg/time - - ps - - releases - - services - - tls - - users - - whitelist -- name: github.com/teamhephy/pkg - version: 777f37a30108edaf6a2bd4e423cde34ec12870fd - subpackages: - - prettyprint - - time -- name: golang.org/x/crypto - version: a1f597ede03a7bef967a422b5b3a5bd08805a01e - subpackages: - - ssh/terminal -- name: golang.org/x/net - version: c2528b2dd8352441850638a8bb678c2ad056fd3e - subpackages: - - context - - idna -- name: golang.org/x/sys - version: 6c81ef8f67ca3f42fc9cd71dfbd5f35b0c4b5771 - subpackages: - - unix - - windows -- name: golang.org/x/text - version: 5d731a35f4867878fc89f7744f7b6debb3beded6 - subpackages: - - transform - - unicode/norm - - width -- name: gopkg.in/yaml.v2 - version: 51d6538a90f86fe93ac480b35f37b2be17fef232 -testImports: [] diff --git a/glide.yaml b/glide.yaml deleted file mode 100644 index 84ed46bb..00000000 --- a/glide.yaml +++ /dev/null @@ -1,18 +0,0 @@ -package: github.com/teamhephy/workflow-cli -ignore: -- appengine -- appengine/user -- appengine/datastore -- appengine/memcache -import: -- package: github.com/teamhephy/pkg - subpackages: - - time -- package: github.com/docopt/docopt-go -- package: golang.org/x/crypto - subpackages: - - ssh/terminal -- package: gopkg.in/yaml.v2 -- package: github.com/olekukonko/tablewriter -- package: github.com/arschles/assert -- package: github.com/teamhephy/controller-sdk-go diff --git a/install-v2.sh b/install-v2.sh index dd72c375..20a19d0b 100644 --- a/install-v2.sh +++ b/install-v2.sh @@ -63,4 +63,4 @@ To learn more about Hephy Workflow, execute: $ ./deis --help -EOF \ No newline at end of file +EOF