Commit f759d594 authored by Henrik Triem's avatar Henrik Triem

Merge branch 'master' into 1.0

parents 272e6a02 411a5509
Pipeline #9544 passed with stages
in 2 minutes and 35 seconds
...@@ -69,6 +69,23 @@ upload/debian/buster: ...@@ -69,6 +69,23 @@ upload/debian/buster:
################################### ###################################
# Ubuntu # Ubuntu
################################### ###################################
build/ubuntu/focal:
<<: *build
variables:
DOCKER_IMAGE: ubuntu/focal
test/ubuntu/focal:
<<: *test
variables:
DOCKER_IMAGE: ubuntu/focal
dependencies:
- build/ubuntu/focal
upload/ubuntu/focal:
<<: *upload
dependencies:
- build/ubuntu/focal
build/ubuntu/bionic: build/ubuntu/bionic:
<<: *build <<: *build
variables: variables:
......
...@@ -5,7 +5,8 @@ ...@@ -5,7 +5,8 @@
export DH_GOPKG := github.com/Icinga/icingadb export DH_GOPKG := github.com/Icinga/icingadb
export DH_GOLANG_GO_GENERATE := 1 export DH_GOLANG_GO_GENERATE := 1
export GO111MODULE=on export GO111MODULE=on
export GOCACHE=on export GOPROXY=direct
export GOCACHE=/home/build/.cache/go-build
ifneq (,$(wildcard /usr/lib/go-1.11)) ifneq (,$(wildcard /usr/lib/go-1.11))
export PATH := /usr/lib/go-1.11/bin:$(PATH) export PATH := /usr/lib/go-1.11/bin:$(PATH)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment