From 761762bdc0286a92a82e1513258c3fcb7cf836f7 Mon Sep 17 00:00:00 2001 From: Stefan Prodan Date: Mon, 26 Jun 2023 19:36:20 +0300 Subject: [PATCH 1/2] Align go.mod version with Kubernetes (Go 1.20) Signed-off-by: Stefan Prodan --- go.mod | 2 +- tests/azure/go.mod | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/go.mod b/go.mod index f65edc8504..d054be0ac3 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/fluxcd/flux2/v2 -go 1.18 +go 1.20 require ( github.com/Masterminds/semver/v3 v3.2.1 diff --git a/tests/azure/go.mod b/tests/azure/go.mod index 38b7a8e019..322ad589ec 100644 --- a/tests/azure/go.mod +++ b/tests/azure/go.mod @@ -1,6 +1,6 @@ module github.com/fluxcd/flux2/tests/azure -go 1.19 +go 1.20 require ( github.com/Azure/azure-event-hubs-go/v3 v3.6.0 From 66a417a3ee5c75bc07b819417677196bd3ad006c Mon Sep 17 00:00:00 2001 From: Stefan Prodan Date: Mon, 26 Jun 2023 19:52:26 +0300 Subject: [PATCH 2/2] Bump Go to 1.20 in aur deps Signed-off-by: Stefan Prodan --- .github/aur/flux-go/PKGBUILD.template | 2 +- .github/aur/flux-scm/PKGBUILD.template | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/aur/flux-go/PKGBUILD.template b/.github/aur/flux-go/PKGBUILD.template index 146e384752..05372e13b4 100644 --- a/.github/aur/flux-go/PKGBUILD.template +++ b/.github/aur/flux-go/PKGBUILD.template @@ -14,7 +14,7 @@ provides=("flux-bin") conflicts=("flux-bin") replaces=("flux-cli") depends=("glibc") -makedepends=('go>=1.17', 'kustomize>=3.0') +makedepends=('go>=1.20', 'kustomize>=5.0') optdepends=('bash-completion: auto-completion for flux in Bash', 'zsh-completions: auto-completion for flux in ZSH') source=( diff --git a/.github/aur/flux-scm/PKGBUILD.template b/.github/aur/flux-scm/PKGBUILD.template index b4c264c0b2..6e213ac2a6 100644 --- a/.github/aur/flux-scm/PKGBUILD.template +++ b/.github/aur/flux-scm/PKGBUILD.template @@ -12,7 +12,7 @@ license=("APACHE") provides=("flux-bin") conflicts=("flux-bin") depends=("glibc") -makedepends=('go>=1.17', 'kustomize>=3.0', 'git') +makedepends=('go>=1.20', 'kustomize>=5.0', 'git') optdepends=('bash-completion: auto-completion for flux in Bash', 'zsh-completions: auto-completion for flux in ZSH') source=(