Skip to content

Commit

Permalink
chore(golang): remove glide, use go mod, use latest hephy/go-dev
Browse files Browse the repository at this point in the history
Signed-off-by: Cryptophobia <aouzounov@gmail.com>
  • Loading branch information
Cryptophobia committed Jul 14, 2020
1 parent 9add21c commit c5032f2
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 94 deletions.
6 changes: 3 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -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
9 changes: 4 additions & 5 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -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" \
Expand All @@ -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
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
65 changes: 0 additions & 65 deletions glide.lock

This file was deleted.

18 changes: 0 additions & 18 deletions glide.yaml

This file was deleted.

2 changes: 1 addition & 1 deletion install-v2.sh
Original file line number Diff line number Diff line change
Expand Up @@ -63,4 +63,4 @@ To learn more about Hephy Workflow, execute:
$ ./deis --help
EOF
EOF

0 comments on commit c5032f2

Please sign in to comment.