mirror of
https://github.com/flatcar/scripts.git
synced 2025-08-16 01:16:59 +02:00
*: Use Go 1.18 instead of 1.17
Use Go 1.18 instead of 1.17 by default in all ebuilds. Note, we still keep building app-emulation/docker{,-cli} with Go 1.17, to be consistent with upstream Docker 20.10.x, which still builds with Go 1.17. That should avoid potential unexpected regressions that happened in the past.
This commit is contained in:
parent
2ef1472e32
commit
601cbca305
@ -5,7 +5,7 @@ EAPI=6
|
||||
|
||||
GITHUB_URI="github.com/containerd/containerd"
|
||||
COREOS_GO_PACKAGE="${GITHUB_URI}"
|
||||
COREOS_GO_VERSION="go1.17"
|
||||
COREOS_GO_VERSION="go1.18"
|
||||
|
||||
if [[ ${PV} == *9999 ]]; then
|
||||
EGIT_REPO_URI="https://${GITHUB_URI}.git"
|
||||
|
@ -5,7 +5,7 @@ EAPI=6
|
||||
EGO_PN="github.com/docker/libnetwork"
|
||||
|
||||
COREOS_GO_PACKAGE="${EGO_PN}"
|
||||
COREOS_GO_VERSION="go1.17"
|
||||
COREOS_GO_VERSION="go1.18"
|
||||
COREOS_GO_GO111MODULE="off"
|
||||
|
||||
if [[ ${PV} == *9999 ]]; then
|
||||
|
@ -5,7 +5,7 @@ EAPI=6
|
||||
|
||||
GITHUB_URI="github.com/opencontainers/runc"
|
||||
COREOS_GO_PACKAGE="${GITHUB_URI}"
|
||||
COREOS_GO_VERSION="go1.17"
|
||||
COREOS_GO_VERSION="go1.18"
|
||||
# the commit of runc that docker uses.
|
||||
# see https://github.com/docker/docker-ce/blob/v19.03.15/components/engine/hack/dockerfile/install/runc.installer#L4
|
||||
COMMIT_ID="886750b989c082700828ec1d3bbb1b397219bfac"
|
||||
|
@ -37,6 +37,7 @@ RDEPEND="${RDEPEND}
|
||||
dev-lang/go-bootstrap
|
||||
dev-lang/go:1.12
|
||||
dev-lang/go:1.17
|
||||
dev-lang/go:1.18
|
||||
dev-lang/nasm
|
||||
=dev-lang/python-3*
|
||||
dev-lang/swig
|
||||
|
@ -11,9 +11,9 @@
|
||||
#
|
||||
# Example:
|
||||
# @CODE
|
||||
# COREOS_GO_VERSION=go1.17
|
||||
# COREOS_GO_VERSION=go1.18
|
||||
# @CODE
|
||||
export COREOS_GO_VERSION="${COREOS_GO_VERSION:-go1.17}"
|
||||
export COREOS_GO_VERSION="${COREOS_GO_VERSION:-go1.18}"
|
||||
|
||||
case "${EAPI:-0}" in
|
||||
5|6) DEPEND="dev-lang/go:${COREOS_GO_VERSION#go}=" ;;
|
||||
|
@ -30,7 +30,7 @@
|
||||
#
|
||||
# Example:
|
||||
# @CODE
|
||||
# COREOS_GO_VERSION=go1.17
|
||||
# COREOS_GO_VERSION=go1.18
|
||||
# @CODE
|
||||
|
||||
case "${EAPI:-0}" in
|
||||
|
Loading…
Reference in New Issue
Block a user