a
/
agola
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #105 from sgotti/update_go_1.13 

*: update to go 1.13
This commit is contained in:
Simone Gotti 2019-09-10 22:58:25 +02:00 committed by GitHub
parent 33c860e78c 6dd9a12e87
commit d8212eddb0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
.agola/config.jsonnet
View File

@ -3,7 +3,7 @@ local go_runtime(version, arch) = {
arch: arch, arch: arch,
containers: [ containers: [
{ {
image: 'golang:' + version + '-stretch', image: 'golang:' + version + '-buster',
}, },
], ],
}; };
@ -32,7 +32,7 @@ local task_build_go(version, arch) = {
{ type: 'run', command: 'make' }, { type: 'run', command: 'make' },
{ type: 'save_cache', key: 'cache-sum-{{ md5sum "go.sum" }}', contents: [{ source_dir: '/go/pkg/mod/cache' }] }, { type: 'save_cache', key: 'cache-sum-{{ md5sum "go.sum" }}', contents: [{ source_dir: '/go/pkg/mod/cache' }] },
{ type: 'save_cache', key: 'cache-date-{{ year }}-{{ month }}-{{ day }}', contents: [{ source_dir: '/go/pkg/mod/cache' }] }, { type: 'save_cache', key: 'cache-date-{{ year }}-{{ month }}-{{ day }}', contents: [{ source_dir: '/go/pkg/mod/cache' }] },
{ type: 'run', name: 'install golangci-lint', command: 'curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s -- -b $(go env GOPATH)/bin v1.17.1' }, { type: 'run', name: 'install golangci-lint', command: 'curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s -- -b $(go env GOPATH)/bin v1.18.0' },
{ type: 'run', command: 'golangci-lint run --deadline 5m' }, { type: 'run', command: 'golangci-lint run --deadline 5m' },
{ type: 'run', name: 'build docker/k8s drivers tests binary', command: 'CGO_ENABLED=0 go test -c ./internal/services/executor/driver -o ./bin/docker-tests' }, { type: 'run', name: 'build docker/k8s drivers tests binary', command: 'CGO_ENABLED=0 go test -c ./internal/services/executor/driver -o ./bin/docker-tests' },
{ type: 'run', name: 'build integration tests binary', command: 'go test -tags "sqlite_unlock_notify" -c ./tests -o ./bin/integration-tests' }, { type: 'run', name: 'build integration tests binary', command: 'go test -tags "sqlite_unlock_notify" -c ./tests -o ./bin/integration-tests' },
@ -107,7 +107,7 @@ local task_build_push_images(name, target, push) =
[ [
task_build_go(version, arch), task_build_go(version, arch),
] ]
for version in ['1.11', '1.12'] for version in ['1.12', '1.13']
for arch in ['amd64' /*, 'arm64' */] for arch in ['amd64' /*, 'arm64' */]
]) + [ ]) + [
{ {
@ -118,7 +118,7 @@ local task_build_push_images(name, target, push) =
{ type: 'run', command: 'SKIP_K8S_TESTS=1 AGOLA_TOOLBOX_PATH="./bin" ./bin/docker-tests -test.parallel 1 -test.v' }, { type: 'run', command: 'SKIP_K8S_TESTS=1 AGOLA_TOOLBOX_PATH="./bin" ./bin/docker-tests -test.parallel 1 -test.v' },
], ],
depends: [ depends: [
'build go 1.12 amd64', 'build go 1.13 amd64',
], ],
}, },
{ {
@ -140,7 +140,7 @@ local task_build_push_images(name, target, push) =
{ type: 'run', name: 'integration tests', command: 'AGOLA_BIN_DIR="./bin" GITEA_PATH=${PWD}/bin/gitea DOCKER_BRIDGE_ADDRESS="172.18.0.1" ./bin/integration-tests -test.parallel 1 -test.v' }, { type: 'run', name: 'integration tests', command: 'AGOLA_BIN_DIR="./bin" GITEA_PATH=${PWD}/bin/gitea DOCKER_BRIDGE_ADDRESS="172.18.0.1" ./bin/integration-tests -test.parallel 1 -test.v' },
], ],
depends: [ depends: [
'build go 1.12 amd64', 'build go 1.13 amd64',
], ],
}, },
{ {

2
Dockerfile
View File

@ -7,7 +7,7 @@ FROM $AGOLAWEB_IMAGE as agola-web
####### #######
# base build image # base build image
FROM golang:1.12-buster AS build_base FROM golang:1.13-buster AS build_base
WORKDIR /agola WORKDIR /agola

2
go.mod
View File

@ -1,5 +1,7 @@
module agola.io/agola module agola.io/agola
go 1.12
require ( require (
code.gitea.io/gitea v1.9.0-dev.0.20190511102134-34eee25bd42d code.gitea.io/gitea v1.9.0-dev.0.20190511102134-34eee25bd42d
code.gitea.io/sdk/gitea v0.0.0-20190602153954-7e711e06b588 code.gitea.io/sdk/gitea v0.0.0-20190602153954-7e711e06b588