Skip to content

Commit

Permalink
Make Gaia go modules compatible (#146)
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
Skarlso authored and michelvocks committed Jan 7, 2019
1 parent c5e1d48 commit 3a95a11
Show file tree
Hide file tree
Showing 1,254 changed files with 163 additions and 495,792 deletions.
15 changes: 12 additions & 3 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,9 @@ jobs:
test_and_coverage:
working_directory: /go/src/github.com/gaia-pipeline/gaia
docker:
- image: circleci/golang:1.10.3-browsers
- image: circleci/golang:1.11.4
environment:
GO111MODULE: "on"
steps:
- checkout
- run:
Expand All @@ -26,23 +28,29 @@ jobs:
- run:
name: Build binary without frontend
command: |
make download
make compile_backend
./gaia-linux-amd64 --version
acceptance_tests:
working_directory: /go/src/github.com/gaia-pipeline/gaia
docker:
- image: gaiapipeline/circleci:0.0.1
- image: gaiapipeline/circleci:0.0.2
environment:
GO111MODULE: "on"
steps:
- checkout
- run:
name: Run acceptance tests
command: |
set -e
make download
make test-acc
compile:
working_directory: /go/src/github.com/gaia-pipeline/gaia
docker:
- image: circleci/golang:1.10.3-browsers
- image: circleci/golang:1.11.4
environment:
GO111MODULE: "on"
steps:
- checkout
- run:
Expand All @@ -59,6 +67,7 @@ jobs:
nvm install v10.5.0
npm cache clean --force
cd ..
make download
make release
- store_artifacts:
path: gaia-linux-amd64
Expand Down
16 changes: 8 additions & 8 deletions .circleci/images/primary/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -24,20 +24,20 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
pkg-config \
&& rm -rf /var/lib/apt/lists/*

ENV GOLANG_VERSION 1.10.3
ENV GOLANG_VERSION 1.11.4

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

0 comments on commit 3a95a11

Please sign in to comment.