Skip to content

Commit c5032f2

Browse files
committed
chore(golang): remove glide, use go mod, use latest hephy/go-dev
Signed-off-by: Cryptophobia <[email protected]>
1 parent 9add21c commit c5032f2

File tree

6 files changed

+10
-94
lines changed

6 files changed

+10
-94
lines changed

.travis.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
language: go
22
go:
3-
- "1.10"
3+
- "1.12"
44
jobs:
55
include:
6-
- stage: Test and build
6+
- stage: Test and Build
77
script:
8-
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
8+
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

Dockerfile

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM hephy/go-dev:v0.22.0
1+
FROM hephy/go-dev:v1.27.1
22
# This Dockerfile is used to bundle the source and all dependencies into an image for testing.
33

44
RUN echo "deb http://packages.cloud.google.com/apt cloud-sdk-jessie main" \
@@ -15,13 +15,12 @@ ENV CGO_ENABLED=0
1515
ADD https://codecov.io/bash /usr/local/bin/codecov
1616
RUN chmod +x /usr/local/bin/codecov
1717

18-
COPY glide.yaml /go/src/github.com/teamhephy/workflow-cli/
19-
COPY glide.lock /go/src/github.com/teamhephy/workflow-cli/
20-
2118
WORKDIR /go/src/github.com/teamhephy/workflow-cli
2219

23-
RUN glide install --strip-vendor
20+
ENV GO111MODULE=on
2421

2522
COPY ./_scripts /usr/local/bin
2623

2724
COPY . /go/src/github.com/teamhephy/workflow-cli
25+
26+
RUN go build

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ endif
1212
GIT_TAG ?= $(shell git describe --abbrev=0 --tags)
1313
REVISION ?= $(shell git rev-parse --short HEAD)
1414

15-
REGISTRY ?= quay.io/
16-
IMAGE_PREFIX ?= deisci
15+
REGISTRY ?=
16+
IMAGE_PREFIX ?= hephy
1717
IMAGE := ${REGISTRY}${IMAGE_PREFIX}/workflow-cli-dev:${REVISION}
1818

1919
BUILD_OS ?=linux darwin windows

glide.lock

Lines changed: 0 additions & 65 deletions
This file was deleted.

glide.yaml

Lines changed: 0 additions & 18 deletions
This file was deleted.

install-v2.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,4 +63,4 @@ To learn more about Hephy Workflow, execute:
6363
6464
$ ./deis --help
6565
66-
EOF
66+
EOF

0 commit comments

Comments
 (0)