From 6a7837bfc61f4a9c061a2171d8d2c4ca9247aabd Mon Sep 17 00:00:00 2001 From: s3lph <1375407-s3lph@users.noreply.gitlab.com> Date: Fri, 14 Oct 2022 02:19:41 +0200 Subject: [PATCH] Update to golang:1.19 --- .gitlab-ci.yml | 2 +- Makefile | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3acdbda..e696e53 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,6 +1,6 @@ --- -image: golang:1.18 +image: golang:1.19 before_script: - export PDE_FULL_VERSION=$(git describe --tags --dirty | sed -re s/^v//) - export PDE_VERSION=$(echo $PDE_FULL_VERSION | cut -d- -f1) diff --git a/Makefile b/Makefile index e51ef0a..c3c867d 100644 --- a/Makefile +++ b/Makefile @@ -2,11 +2,11 @@ PDE_VERSION=$$(git describe --tags --dirty | sed -re s/^v// | cut -d- -f1) PDE_REVISION=$$(git describe --tags --dirty | cut -d- -f2-) -LD_VERSION=-X github.com/prometheus/common/version.Version=$(PDE_VERSION) -LD_REVISION=-X github.com/prometheus/common/version.Revision=$(PDE_REVISION) -LD_BRANCH=-X github.com/prometheus/common/version.Branch=$$(git branch | grep '*' | cut -d ' ' -f 2-) -LD_USER=-X github.com/prometheus/common/version.BuildUser=$$(whoami)@$$(hostname -f) -LD_DATE=-X github.com/prometheus/common/version.BuildDate=$$(date --iso-8601=seconds) +LD_VERSION=-X 'github.com/prometheus/common/version.Version=$(PDE_VERSION)' +LD_REVISION=-X 'github.com/prometheus/common/version.Revision=$(PDE_REVISION)' +LD_BRANCH=-X 'github.com/prometheus/common/version.Branch=$$(git branch | grep '*' | cut -d ' ' -f 2-)' +LD_USER=-X 'github.com/prometheus/common/version.BuildUser=$$(whoami)@$$(hostname -f)' +LD_DATE=-X 'github.com/prometheus/common/version.BuildDate=$$(date --iso-8601=seconds)' LDFLAGS=-s $(LD_VERSION) $(LD_REVISION) $(LD_BRANCH) $(LD_USER) $(LD_DATE) prometheus-dnssec-exporter: