From c11eb8a315189ecef09c91a054a28c5eac70eeba Mon Sep 17 00:00:00 2001 From: Pierre-Olivier Mercier Date: Mon, 21 Mar 2022 14:22:09 +0100 Subject: [PATCH] CI: Fix compilation with go 1.18 --- .drone.yml | 44 +++++++++++++++--------------- Dockerfile-admin | 2 +- Dockerfile-backend | 2 +- Dockerfile-dashboard | 2 +- Dockerfile-frontend | 2 +- Dockerfile-qa | 2 +- Dockerfile-remote-scores-sync-zqds | 2 +- 7 files changed, 28 insertions(+), 28 deletions(-) diff --git a/.drone.yml b/.drone.yml index 526db0b0..66191483 100644 --- a/.drone.yml +++ b/.drone.yml @@ -28,19 +28,19 @@ steps: image: golang:alpine commands: - apk --no-cache add build-base - - go vet -v -tags gitgo srs.epita.fr/fic-server/admin - - go vet -v srs.epita.fr/fic-server/admin - - go vet -v srs.epita.fr/fic-server/backend - - go vet -v srs.epita.fr/fic-server/frontend - - go vet -v srs.epita.fr/fic-server/dashboard - - go vet -v srs.epita.fr/fic-server/repochecker - - go vet -v srs.epita.fr/fic-server/qa + - go vet -v -buildvcs=false -tags gitgo srs.epita.fr/fic-server/admin + - go vet -v -buildvcs=false srs.epita.fr/fic-server/admin + - go vet -v -buildvcs=false srs.epita.fr/fic-server/backend + - go vet -v -buildvcs=false srs.epita.fr/fic-server/frontend + - go vet -v -buildvcs=false srs.epita.fr/fic-server/dashboard + - go vet -v -buildvcs=false srs.epita.fr/fic-server/repochecker + - go vet -v -buildvcs=false srs.epita.fr/fic-server/qa - name: build admin image: golang:alpine commands: - - go build -v -tags gitgo -o deploy/admin-gitgo-${DRONE_STAGE_OS}-${DRONE_STAGE_ARCH} srs.epita.fr/fic-server/admin - - go build -v -o deploy/admin-${DRONE_STAGE_OS}-${DRONE_STAGE_ARCH} srs.epita.fr/fic-server/admin + - go build -v -buildvcs=false -tags gitgo -o deploy/admin-gitgo-${DRONE_STAGE_OS}-${DRONE_STAGE_ARCH} srs.epita.fr/fic-server/admin + - go build -v -buildvcs=false -o deploy/admin-${DRONE_STAGE_OS}-${DRONE_STAGE_ARCH} srs.epita.fr/fic-server/admin - tar chjf deploy/htdocs-admin.tar.bz2 htdocs-admin environment: CGO_ENABLED: 0 @@ -48,14 +48,14 @@ steps: - name: build backend image: golang:alpine commands: - - go build -v -o deploy/backend-${DRONE_STAGE_OS}-${DRONE_STAGE_ARCH} srs.epita.fr/fic-server/backend + - go build -v -buildvcs=false -o deploy/backend-${DRONE_STAGE_OS}-${DRONE_STAGE_ARCH} srs.epita.fr/fic-server/backend environment: CGO_ENABLED: 0 - name: build frontend image: golang:alpine commands: - - go build -v -o deploy/frontend-${DRONE_STAGE_OS}-${DRONE_STAGE_ARCH} srs.epita.fr/fic-server/frontend + - go build -v -buildvcs=false -o deploy/frontend-${DRONE_STAGE_OS}-${DRONE_STAGE_ARCH} srs.epita.fr/fic-server/frontend environment: CGO_ENABLED: 0 @@ -72,7 +72,7 @@ steps: - name: build dashboard image: golang:alpine commands: - - go build -v -o deploy/dashboard-${DRONE_STAGE_OS}-${DRONE_STAGE_ARCH} srs.epita.fr/fic-server/dashboard + - go build -v -buildvcs=false -o deploy/dashboard-${DRONE_STAGE_OS}-${DRONE_STAGE_ARCH} srs.epita.fr/fic-server/dashboard - tar chjf deploy/htdocs-dashboard.tar.bz2 htdocs-dashboard environment: CGO_ENABLED: 0 @@ -80,7 +80,7 @@ steps: - name: build repochecker image: golang:alpine commands: - - go build --tags checkupdate -v -o deploy/repochecker-${DRONE_STAGE_OS}-${DRONE_STAGE_ARCH} srs.epita.fr/fic-server/repochecker + - go build -buildvcs=false --tags checkupdate -v -o deploy/repochecker-${DRONE_STAGE_OS}-${DRONE_STAGE_ARCH} srs.epita.fr/fic-server/repochecker - grep "const version" repochecker/update.go | sed -r 's/^.*=\s*(\S.*)$/\1/' > deploy/repochecker.version environment: CGO_ENABLED: 0 @@ -88,7 +88,7 @@ steps: - name: build repochecker for macOS image: golang:alpine commands: - - go build --tags checkupdate -v -o deploy/repochecker-darwin-${DRONE_STAGE_ARCH} srs.epita.fr/fic-server/repochecker + - go build -buildvcs=false --tags checkupdate -v -o deploy/repochecker-darwin-${DRONE_STAGE_ARCH} srs.epita.fr/fic-server/repochecker environment: CGO_ENABLED: 0 GOOS: darwin @@ -97,7 +97,7 @@ steps: - name: build qa image: golang:alpine commands: - - go build -v -o deploy/qa-${DRONE_STAGE_OS}-${DRONE_STAGE_ARCH} srs.epita.fr/fic-server/qa + - go build -v -buildvcs=false -o deploy/qa-${DRONE_STAGE_OS}-${DRONE_STAGE_ARCH} srs.epita.fr/fic-server/qa - tar chjf deploy/htdocs-qa.tar.bz2 htdocs-qa environment: CGO_ENABLED: 0 @@ -288,21 +288,21 @@ steps: - name: build admin image: golang:alpine commands: - - go build -v -o deploy/admin-${DRONE_STAGE_OS}-${DRONE_STAGE_ARCH} srs.epita.fr/fic-server/admin + - go build -v -buildvcs=false -o deploy/admin-${DRONE_STAGE_OS}-${DRONE_STAGE_ARCH} srs.epita.fr/fic-server/admin environment: CGO_ENABLED: 0 - name: build backend image: golang:alpine commands: - - go build -v -o deploy/backend-${DRONE_STAGE_OS}-${DRONE_STAGE_ARCH} srs.epita.fr/fic-server/backend + - go build -v -buildvcs=false -o deploy/backend-${DRONE_STAGE_OS}-${DRONE_STAGE_ARCH} srs.epita.fr/fic-server/backend environment: CGO_ENABLED: 0 - name: build frontend image: golang:alpine commands: - - go build -v -o deploy/frontend-${DRONE_STAGE_OS}-${DRONE_STAGE_ARCH} srs.epita.fr/fic-server/frontend + - go build -v -buildvcs=false -o deploy/frontend-${DRONE_STAGE_OS}-${DRONE_STAGE_ARCH} srs.epita.fr/fic-server/frontend environment: CGO_ENABLED: 0 @@ -318,14 +318,14 @@ steps: - name: build dashboard image: golang:alpine commands: - - go build -v -o deploy/dashboard-${DRONE_STAGE_OS}-${DRONE_STAGE_ARCH} srs.epita.fr/fic-server/dashboard + - go build -v -buildvcs=false -o deploy/dashboard-${DRONE_STAGE_OS}-${DRONE_STAGE_ARCH} srs.epita.fr/fic-server/dashboard environment: CGO_ENABLED: 0 - name: build repochecker image: golang:alpine commands: - - go build --tags checkupdate -v -o deploy/repochecker-${DRONE_STAGE_OS}-${DRONE_STAGE_ARCH} srs.epita.fr/fic-server/repochecker + - go build -buildvcs=false --tags checkupdate -v -o deploy/repochecker-${DRONE_STAGE_OS}-${DRONE_STAGE_ARCH} srs.epita.fr/fic-server/repochecker environment: CGO_ENABLED: 0 @@ -333,7 +333,7 @@ steps: image: golang:alpine commands: - apk --no-cache add build-base - - go build --tags checkupdate -v -o deploy/repochecker-darwin-${DRONE_STAGE_ARCH} srs.epita.fr/fic-server/repochecker + - go build -buildvcs=false --tags checkupdate -v -o deploy/repochecker-darwin-${DRONE_STAGE_ARCH} srs.epita.fr/fic-server/repochecker environment: CGO_ENABLED: 0 GOOS: darwin @@ -342,7 +342,7 @@ steps: - name: build qa image: golang:alpine commands: - - go build -v -o deploy/qa-${DRONE_STAGE_OS}-${DRONE_STAGE_ARCH} srs.epita.fr/fic-server/qa + - go build -v -buildvcs=false -o deploy/qa-${DRONE_STAGE_OS}-${DRONE_STAGE_ARCH} srs.epita.fr/fic-server/qa environment: CGO_ENABLED: 0 diff --git a/Dockerfile-admin b/Dockerfile-admin index bb81198c..ae4ebc79 100644 --- a/Dockerfile-admin +++ b/Dockerfile-admin @@ -10,7 +10,7 @@ COPY libfic ./libfic/ COPY admin ./admin/ RUN go get -d -v ./admin && \ - go build -v -o admin/admin ./admin + go build -v -buildvcs=false -o admin/admin ./admin FROM alpine:3.14 diff --git a/Dockerfile-backend b/Dockerfile-backend index 74f4935e..d348da09 100644 --- a/Dockerfile-backend +++ b/Dockerfile-backend @@ -10,7 +10,7 @@ COPY libfic ./libfic/ COPY backend ./backend/ RUN go get -d -v ./backend && \ - go build -v -o backend/backend ./backend + go build -v -buildvcs=false -o backend/backend ./backend FROM alpine:3.14 diff --git a/Dockerfile-dashboard b/Dockerfile-dashboard index 913941df..42c133f2 100644 --- a/Dockerfile-dashboard +++ b/Dockerfile-dashboard @@ -10,7 +10,7 @@ COPY libfic ./libfic/ COPY dashboard ./dashboard/ RUN go get -d -v ./dashboard && \ - go build -v -o dashboard/dashboard ./dashboard + go build -v -buildvcs=false -o dashboard/dashboard ./dashboard FROM alpine:3.14 diff --git a/Dockerfile-frontend b/Dockerfile-frontend index cf2046ed..c2048200 100644 --- a/Dockerfile-frontend +++ b/Dockerfile-frontend @@ -10,7 +10,7 @@ COPY libfic ./libfic/ COPY frontend ./frontend/ RUN go get -d -v ./frontend && \ - go build -v -o ./frontend/frontend ./frontend + go build -v -buildvcs=false -o ./frontend/frontend ./frontend FROM alpine:3.14 diff --git a/Dockerfile-qa b/Dockerfile-qa index 77f9c2cb..125d313a 100644 --- a/Dockerfile-qa +++ b/Dockerfile-qa @@ -10,7 +10,7 @@ COPY libfic ./libfic/ COPY qa ./qa/ RUN go get -d -v ./qa && \ - go build -v -o qa/qa ./qa + go build -v -buildvcs=false -o qa/qa ./qa FROM alpine:3.14 diff --git a/Dockerfile-remote-scores-sync-zqds b/Dockerfile-remote-scores-sync-zqds index 1b26fcde..d1847391 100644 --- a/Dockerfile-remote-scores-sync-zqds +++ b/Dockerfile-remote-scores-sync-zqds @@ -9,7 +9,7 @@ COPY libfic ./libfic/ COPY remote/scores-sync-zqds ./remote/scores-sync-zqds/ RUN go get -d -v ./remote/scores-sync-zqds && \ - go build -v -o ./scores-sync-zqds ./remote/scores-sync-zqds + go build -v -buildvcs=false -o ./scores-sync-zqds ./remote/scores-sync-zqds FROM alpine:3.14