Skip to content

update golang version, move to go modules, no more vendor #267

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
laverya merged 4 commits into from
Jan 30, 2020
Merged

update golang version, move to go modules, no more vendor #267

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
16f1067
remove vendor folder, gopkg files
laverya Jan 30, 2020
5724484
update Dockerfile, Makefile, add go.mod/go.sum
laverya Jan 30, 2020
11b3076
update circleci yaml to use later golang
laverya Jan 30, 2020
148b61d
enable go 11 modules for hack/docs build
laverya Jan 30, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
The diff you're trying to view is too large. We only load the first 3000 changed files.
14 changes: 7 additions & 7 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:

docs:
docker:
- image: replicated/gitops-builder:node8-go11
- image: replicated/gitops-builder:node8-go12
working_directory: /go/src/github.com/replicatedcom/support-bundle
steps:
- checkout
Expand All @@ -16,7 +16,7 @@ jobs:
make pipeline-nointegration
test:
docker:
- image: circleci/golang:1.10
- image: circleci/golang:1.13
working_directory: /go/src/github.com/replicatedcom/support-bundle
steps:
- checkout
Expand All @@ -28,7 +28,7 @@ jobs:
working_directory: /home/circleci/go/src/github.com/replicatedcom/support-bundle
environment:
GOPATH: /home/circleci/go
GO_SHA256SUM: fa04efdb17a275a0c6e137f969a1c4eb878939e91e1da16060ce42f02c2ec5ec
GO_SHA256SUM: b3dd4bd781a0271b33168e627f7f43886b4c5d1c794a4015abf34e99c6526ca3
GO: /usr/local/go/bin/go
GOCACHE: "/tmp/go/cache"
steps:
Expand All @@ -37,7 +37,7 @@ jobs:
keys:
- support-bundle-e2e-build-cache-base
- run: |
export GO_DOWNLOAD_URL=https://dl.google.com/go/go1.10.4.linux-amd64.tar.gz
export GO_DOWNLOAD_URL=https://dl.google.com/go/go1.13.7.linux-amd64.tar.gz
export GOPATH=/home/circleci/go
export GOROOT=/usr/local/go
export PATH=$PATH:$GOROOT/bin:$GOPATH/bin
Expand All @@ -48,7 +48,7 @@ jobs:
tar -zxvf golang.tar.gz -C /tmp
sudo rm -rf ${GOROOT}
sudo mv /tmp/go ${GOROOT}
- run: docker run -d --entrypoint sh --label com.replicated.support-bundle=true circleci/golang:1.10 -c "sleep infinity"
- run: docker run -d --entrypoint sh --label com.replicated.support-bundle=true circleci/golang:1.13 -c "sleep infinity"
- run: |
export GOPATH=/home/circleci/go
export GOROOT=/usr/local/go
Expand All @@ -61,7 +61,7 @@ jobs:

deploy:
docker:
- image: circleci/golang:1.10
- image: circleci/golang:1.13
working_directory: /go/src/github.com/replicatedcom/support-bundle
steps:
- checkout
Expand All @@ -74,7 +74,7 @@ jobs:

deploy_unstable:
docker:
- image: circleci/golang:1.10
- image: circleci/golang:1.13
working_directory: /go/src/github.com/replicatedcom/support-bundle
steps:
- checkout
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.10
FROM golang:1.13

RUN DEBIAN_FRONTEND=noninteractive apt-get update && apt-get install --no-install-recommends -y \
jq \
Expand All @@ -9,6 +9,6 @@ ENV PROJECTPATH=/go/src/github.com/replicatedcom/support-bundle
WORKDIR $PROJECTPATH

ADD Makefile .
RUN make build-deps dep-deps
RUN make build-deps

CMD ["/bin/bash"]
Loading