Skip to content

Commit 3a95a11

Browse files
Skarlsomichelvocks
authored andcommitted
Make Gaia go modules compatible (#146)
* Make Gaia go modules compatible. * Am I doing this right? * Instead of running make get everywhere, have a dependency setup job. * Huh. * Trying go mod download instead of go get. * Fixed value. * Updated gaia image go version. * Added new circleci image * Upgrade to go 1.11.4 * Changes hash for new go version. * Change version to 1.11.4
1 parent c5e1d48 commit 3a95a11

File tree

1,254 files changed

+163
-495792
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,254 files changed

+163
-495792
lines changed

.circleci/config.yml

+12-3
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,9 @@ jobs:
44
test_and_coverage:
55
working_directory: /go/src/github.com/gaia-pipeline/gaia
66
docker:
7-
- image: circleci/golang:1.10.3-browsers
7+
- image: circleci/golang:1.11.4
8+
environment:
9+
GO111MODULE: "on"
810
steps:
911
- checkout
1012
- run:
@@ -26,23 +28,29 @@ jobs:
2628
- run:
2729
name: Build binary without frontend
2830
command: |
31+
make download
2932
make compile_backend
3033
./gaia-linux-amd64 --version
3134
acceptance_tests:
3235
working_directory: /go/src/github.com/gaia-pipeline/gaia
3336
docker:
34-
- image: gaiapipeline/circleci:0.0.1
37+
- image: gaiapipeline/circleci:0.0.2
38+
environment:
39+
GO111MODULE: "on"
3540
steps:
3641
- checkout
3742
- run:
3843
name: Run acceptance tests
3944
command: |
4045
set -e
46+
make download
4147
make test-acc
4248
compile:
4349
working_directory: /go/src/github.com/gaia-pipeline/gaia
4450
docker:
45-
- image: circleci/golang:1.10.3-browsers
51+
- image: circleci/golang:1.11.4
52+
environment:
53+
GO111MODULE: "on"
4654
steps:
4755
- checkout
4856
- run:
@@ -59,6 +67,7 @@ jobs:
5967
nvm install v10.5.0
6068
npm cache clean --force
6169
cd ..
70+
make download
6271
make release
6372
- store_artifacts:
6473
path: gaia-linux-amd64

.circleci/images/primary/Dockerfile

+8-8
Original file line numberDiff line numberDiff line change
@@ -24,20 +24,20 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
2424
pkg-config \
2525
&& rm -rf /var/lib/apt/lists/*
2626

27-
ENV GOLANG_VERSION 1.10.3
27+
ENV GOLANG_VERSION 1.11.4
2828

2929
RUN set -eux; \
3030
\
3131
# this "case" statement is generated via "update.sh"
3232
dpkgArch="$(dpkg --print-architecture)"; \
3333
case "${dpkgArch##*-}" in \
34-
amd64) goRelArch='linux-amd64'; goRelSha256='fa1b0e45d3b647c252f51f5e1204aba049cde4af177ef9f2181f43004f901035' ;; \
35-
armhf) goRelArch='linux-armv6l'; goRelSha256='d3df3fa3d153e81041af24f31a82f86a21cb7b92c1b5552fb621bad0320f06b6' ;; \
36-
arm64) goRelArch='linux-arm64'; goRelSha256='355128a05b456c9e68792143801ad18e0431510a53857f640f7b30ba92624ed2' ;; \
37-
i386) goRelArch='linux-386'; goRelSha256='3d5fe1932c904a01acb13dae07a5835bffafef38bef9e5a05450c52948ebdeb4' ;; \
38-
ppc64el) goRelArch='linux-ppc64le'; goRelSha256='f3640b2f0990a9617c937775f669ee18f10a82e424e5f87a8ce794a6407b8347' ;; \
39-
s390x) goRelArch='linux-s390x'; goRelSha256='34385f64651f82fbc11dc43bdc410c2abda237bdef87f3a430d35a508ec3ce0d' ;; \
40-
*) goRelArch='src'; goRelSha256='567b1cc66c9704d1c019c50bef946272e911ec6baf244310f87f4e678be155f2'; \
34+
amd64) goRelArch='linux-amd64'; goRelSha256='fb26c30e6a04ad937bbc657a1b5bba92f80096af1e8ee6da6430c045a8db3a5b' ;; \
35+
armhf) goRelArch='linux-armv6l'; goRelSha256='9f7a71d27fef69f654a93e265560c8d9db1a2ca3f1dcdbe5288c46facfde5821' ;; \
36+
arm64) goRelArch='linux-arm64'; goRelSha256='b76df430ba8caff197b8558921deef782cdb20b62fa36fa93f81a8c08ab7c8e7' ;; \
37+
i386) goRelArch='linux-386'; goRelSha256='cecd2da1849043237d5f0756a93d601db6798fa3bb27a14563d201088aa415f3' ;; \
38+
ppc64el) goRelArch='linux-ppc64le'; goRelSha256='1f10146826acd56716b00b9188079af53823ddd79ceb6362e78e2f3aafb370ab' ;; \
39+
s390x) goRelArch='linux-s390x'; goRelSha256='4467442dacf89eb94c5d6f9f700204cb360be82db60e6296cc2ef8d0e890cd42' ;; \
40+
*) goRelArch='src'; goRelSha256='4cfd42720a6b1e79a8024895fa6607b69972e8e32446df76d6ce79801bbadb15'; \
4141
echo >&2; echo >&2 "warning: current architecture ($dpkgArch) does not have a corresponding Go binary release; will be building from source"; echo >&2 ;; \
4242
esac; \
4343
\

0 commit comments

Comments
 (0)