Bump xgo and go to v1.19.5 (#1538) (#1547)

Backport #1538
This commit is contained in:
6543 2023-01-15 17:35:33 +01:00 committed by GitHub
parent 7fa68a80eb
commit e0a497a4a5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 9 deletions

View file

@ -3,7 +3,7 @@ depends_on:
- web
variables:
- &golang_image 'golang:1.18.7'
- &golang_image 'golang:1.19.5'
- &node_image 'node:16-alpine'
- &when_path
# related config files

View file

@ -3,10 +3,10 @@ depends_on:
- web
variables:
- &golang_image 'golang:1.18.7'
- &golang_image 'golang:1.19.5'
- &node_image 'node:16-alpine'
- &xgo_image 'techknowlogick/xgo:go-1.18.7'
- &xgo_version 'go-1.18.7'
- &xgo_image 'techknowlogick/xgo:go-1.19.5'
- &xgo_version 'go-1.19.5'
- &platforms_release 'linux/arm/v6,linux/arm/v7,linux/arm64/v8,linux/386,linux/amd64,linux/ppc64le,linux/riscv64,linux/s390x,windows/amd64,freebsd/arm64,freebsd/amd64,openbsd/arm64,openbsd/amd64'
- &platforms_server 'linux/arm/v7,linux/arm64/v8,linux/amd64,linux/ppc64le,linux/riscv64'
- &platforms_preview 'linux/arm/v6,linux/arm64/v8,linux/amd64,linux/riscv64,windows/amd64'

View file

@ -1,6 +1,5 @@
variables:
- &golang_image 'golang:1.18.7'
- &node_image 'node:16-alpine'
- &golang_image 'golang:1.19.5'
- &when_path
# related config files
- ".woodpecker/test.yml"

View file

@ -22,9 +22,9 @@ LDFLAGS := -s -w -extldflags "-static" -X github.com/woodpecker-ci/woodpecker/ve
CGO_CFLAGS ?=
HAS_GO = $(shell hash go > /dev/null 2>&1 && echo "GO" || echo "NOGO" )
ifeq ($(HAS_GO), GO)
XGO_VERSION ?= go-1.18.x
CGO_CFLAGS ?= $(shell $(GO) env CGO_CFLAGS)
ifeq ($(HAS_GO),GO)
XGO_VERSION ?= go-1.19.x
CGO_CFLAGS ?= $(shell go env CGO_CFLAGS)
endif
# If the first argument is "in_docker"...