Merge pull request #959 from kinvolk/dongsu/go-1.16-default

Set the default Go version to 1.16
This commit is contained in:
Dongsu Park 2021-04-20 13:59:31 +02:00 committed by GitHub
commit 818e27951e
5 changed files with 5 additions and 4 deletions

View File

@ -6,6 +6,7 @@ CROS_WORKON_PROJECT="flatcar-linux/updateservicectl"
CROS_WORKON_LOCALNAME="updateservicectl" CROS_WORKON_LOCALNAME="updateservicectl"
CROS_WORKON_REPO="git://github.com" CROS_WORKON_REPO="git://github.com"
COREOS_GO_PACKAGE="github.com/coreos/updateservicectl" COREOS_GO_PACKAGE="github.com/coreos/updateservicectl"
COREOS_GO_GO111MODULE="off"
inherit cros-workon coreos-go inherit cros-workon coreos-go
if [[ "${PV}" == 9999 ]]; then if [[ "${PV}" == 9999 ]]; then

View File

@ -6,6 +6,7 @@ CROS_WORKON_PROJECT="appc/acbuild"
CROS_WORKON_REPO="git://github.com" CROS_WORKON_REPO="git://github.com"
CROS_WORKON_LOCALNAME="appc-acbuild" CROS_WORKON_LOCALNAME="appc-acbuild"
COREOS_GO_PACKAGE="github.com/appc/acbuild" COREOS_GO_PACKAGE="github.com/appc/acbuild"
COREOS_GO_GO111MODULE="off"
inherit coreos-go toolchain-funcs cros-workon inherit coreos-go toolchain-funcs cros-workon
if [[ "${PV}" == 9999 ]]; then if [[ "${PV}" == 9999 ]]; then

View File

@ -5,7 +5,6 @@ EAPI=7
inherit coreos-go inherit coreos-go
COREOS_GO_VERSION="go1.15"
COREOS_GO_PACKAGE="github.com/kubernetes-sigs/cri-tools" COREOS_GO_PACKAGE="github.com/kubernetes-sigs/cri-tools"
COREOS_GO_MOD="vendor" COREOS_GO_MOD="vendor"

View File

@ -11,9 +11,9 @@
# #
# Example: # Example:
# @CODE # @CODE
# COREOS_GO_VERSION=go1.15 # COREOS_GO_VERSION=go1.16
# @CODE # @CODE
export COREOS_GO_VERSION="${COREOS_GO_VERSION:-go1.15}" export COREOS_GO_VERSION="${COREOS_GO_VERSION:-go1.16}"
case "${EAPI:-0}" in case "${EAPI:-0}" in
5|6) DEPEND="dev-lang/go:${COREOS_GO_VERSION#go}=" ;; 5|6) DEPEND="dev-lang/go:${COREOS_GO_VERSION#go}=" ;;

View File

@ -30,7 +30,7 @@
# #
# Example: # Example:
# @CODE # @CODE
# COREOS_GO_VERSION=go1.15 # COREOS_GO_VERSION=go1.16
# @CODE # @CODE
case "${EAPI:-0}" in case "${EAPI:-0}" in