From aba140d13bccbda730c4f90c208104c4556ebd1a Mon Sep 17 00:00:00 2001 From: app-autoscaler-ci-bot Date: Tue, 12 Mar 2024 10:41:44 +0000 Subject: [PATCH 1/6] Update golang version to 1.21.3 --- .../packages/golang-1-linux/index.yml | 12 +++++--- .../tasks/update-sdk/update_golang_package.sh | 28 +++++++++---------- .../concourse/pipelines/api-tester/src/go.mod | 2 +- go.work | 2 +- packages/golang-1-linux/spec.lock | 2 +- packages/golang-1-linux/vendored-commit | 2 +- packages/golang-1-linux/version | 2 +- src/acceptance/assets/app/go_app/go.mod | 2 +- src/acceptance/go.mod | 2 +- src/autoscaler/go.mod | 2 +- src/changelog/go.mod | 2 +- src/changeloglockcleaner/go.mod | 2 +- 12 files changed, 32 insertions(+), 28 deletions(-) diff --git a/.final_builds/packages/golang-1-linux/index.yml b/.final_builds/packages/golang-1-linux/index.yml index 0921640d8b..4c77986b14 100644 --- a/.final_builds/packages/golang-1-linux/index.yml +++ b/.final_builds/packages/golang-1-linux/index.yml @@ -15,10 +15,6 @@ builds: version: 2336380dbf01a44020813425f92be34685ce118bf4767406c461771cfef14fc9 blobstore_id: 9a9ec445-3d59-4f58-41a6-0a982553fe0b sha1: sha256:c440fd7aa6d179a6891f765c46f69fa2b6cbadd8da3b019a4fb27fc9001a4f1f - 2bba3dc3872d3475f3aa9476963ed92dae8471d15419714082e19d2b34a0e01e: - version: 2bba3dc3872d3475f3aa9476963ed92dae8471d15419714082e19d2b34a0e01e - blobstore_id: 694ff607-3c1e-4f90-41ca-c4c5d7126b63 - sha1: sha256:53f80714c8acd709ad39e7619f89af7766854a8d81be21d698aeaf5fd5d6e090 2598f3c61c5a9e674fb01f9d5c11ecdbaeb18622b0296ade3fed5e774ee15421: version: 2598f3c61c5a9e674fb01f9d5c11ecdbaeb18622b0296ade3fed5e774ee15421 blobstore_id: bb850386-19ad-4ef1-7348-e7942b50b929 @@ -27,6 +23,10 @@ builds: version: 29f2024e7d815be0694944c3c3c9512914a36a31d5fa1b2cbd2452c8d331ce90 blobstore_id: e76cbbf4-34ca-4b05-5e99-21f0847f41fb sha1: sha256:74e09558cd565077109cf445c90c3a1f8df661e8bbfdf04cc6f6693714f99304 + 2bba3dc3872d3475f3aa9476963ed92dae8471d15419714082e19d2b34a0e01e: + version: 2bba3dc3872d3475f3aa9476963ed92dae8471d15419714082e19d2b34a0e01e + blobstore_id: 694ff607-3c1e-4f90-41ca-c4c5d7126b63 + sha1: sha256:53f80714c8acd709ad39e7619f89af7766854a8d81be21d698aeaf5fd5d6e090 4c3c9f041ae80eb4373ed31efe56164d0f4733456c3e110d62dd92d310d6b86e: version: 4c3c9f041ae80eb4373ed31efe56164d0f4733456c3e110d62dd92d310d6b86e blobstore_id: 164a9df5-ab52-441f-7a07-c257b39e8d44 @@ -39,6 +39,10 @@ builds: version: 5e5e7040d67e2b9a4696bbce1b6b37a16b8bb7d0a220ddda8f3918ecce4b9a2c blobstore_id: 55ae0bcb-1d1a-47e5-650e-72f113b34923 sha1: sha256:b129155ee29328ba69d2447dd8bba56fb002e93caf3c7062fae3374190f8b5ca + 6aad26c0e11f1c08fe8408af93d386eed66fd4c29170b8d9a034677eaa4f61d9: + version: 6aad26c0e11f1c08fe8408af93d386eed66fd4c29170b8d9a034677eaa4f61d9 + blobstore_id: b17ac9cd-b3de-48ba-7e67-ce7209ee8a2f + sha1: sha256:6742860369e7ce134e8ca4a037917d386ef6b0b92338a5b46114baee4d3cea19 6f86822e163425375f3a1b9d781b678f30fd4b6ee619b033fcf5e7e18563e74e: version: 6f86822e163425375f3a1b9d781b678f30fd4b6ee619b033fcf5e7e18563e74e blobstore_id: 0a69914c-05f2-4397-4cc1-390d8b2b6640 diff --git a/ci/autoscaler/tasks/update-sdk/update_golang_package.sh b/ci/autoscaler/tasks/update-sdk/update_golang_package.sh index 7751e53c6d..54d721a7a9 100755 --- a/ci/autoscaler/tasks/update-sdk/update_golang_package.sh +++ b/ci/autoscaler/tasks/update-sdk/update_golang_package.sh @@ -2,26 +2,26 @@ [ -n "${DEBUG}" ] && set -x set -euo pipefail -script_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )" +script_dir="$(cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd)" source "${script_dir}/vars.source.sh" source "${script_dir}/vendor_package.sh" golang_dir=${GOLANG_DIR:-"${autoscaler_dir}/../golang-release"} -export golang_dir="$(realpath -e "${golang_dir}")" +golang_dir="$(realpath -e "${golang_dir}")" +export golang_dir -SED="sed" -which gsed >/dev/null && SED=gsed +golang_version=$(cat "${golang_dir}/packages/golang-1-linux/version") +golang_version="1.21.3" -# shellcheck disable=SC2154 -golang_version=$( cat "${golang_dir}/packages/golang-1-linux/version") -stripped_go_version=$(echo "${golang_version}" | cut -d . -f -2) +step "updating go.work file with golang version ${golang_version}" +go work edit -go "${golang_version}" "${autoscaler_dir}/go.work" -step "updating mod files with ${stripped_go_version}" -# shellcheck disable=SC2154 -find "${autoscaler_dir}" -name go.mod -type f -exec ${SED} -i "s/^[[:space:]]*go 1.*/go ${stripped_go_version}/g" "{}" \; +step "updating go.mod files with golang version ${golang_version}" +find "${autoscaler_dir}" -name go.mod -type f -exec go mod edit -go "${golang_version}" "{}" \; -step "updating .tool-version with ${golang_version}" -"${SED}" -i "s/golang 1.*/golang ${golang_version}/g" "${autoscaler_dir}/.tool-versions" +step "updating .tool-versions file with golang version ${golang_version}" +sed -i "s/golang 1.*/golang ${golang_version}/g" "${autoscaler_dir}/.tool-versions" + +echo -n "${golang_version}" > "${autoscaler_dir}/version" +vendor-package "${golang_dir}" golang-1-linux "${golang_version}" -echo -n "${golang_version}" > ${autoscaler_dir}/version -vendor-package "$golang_dir" golang-1-linux "${golang_version}" \ No newline at end of file diff --git a/ci/terragrunt/app-autoscaler/concourse/pipelines/api-tester/src/go.mod b/ci/terragrunt/app-autoscaler/concourse/pipelines/api-tester/src/go.mod index dfdcc9af44..6764238d2d 100644 --- a/ci/terragrunt/app-autoscaler/concourse/pipelines/api-tester/src/go.mod +++ b/ci/terragrunt/app-autoscaler/concourse/pipelines/api-tester/src/go.mod @@ -1,3 +1,3 @@ module apitester -go 1.21 +go 1.21.3 diff --git a/go.work b/go.work index 6c03acaf50..ae4c8bd4af 100644 --- a/go.work +++ b/go.work @@ -1,4 +1,4 @@ -go 1.21 +go 1.21.3 use ( ./src/acceptance diff --git a/packages/golang-1-linux/spec.lock b/packages/golang-1-linux/spec.lock index 4438b3f5f3..b4a0abaed8 100644 --- a/packages/golang-1-linux/spec.lock +++ b/packages/golang-1-linux/spec.lock @@ -1,2 +1,2 @@ name: golang-1-linux -fingerprint: 2bba3dc3872d3475f3aa9476963ed92dae8471d15419714082e19d2b34a0e01e +fingerprint: 6aad26c0e11f1c08fe8408af93d386eed66fd4c29170b8d9a034677eaa4f61d9 diff --git a/packages/golang-1-linux/vendored-commit b/packages/golang-1-linux/vendored-commit index adc943747e..4a12bf3e90 100644 --- a/packages/golang-1-linux/vendored-commit +++ b/packages/golang-1-linux/vendored-commit @@ -1 +1 @@ -aeaff4cc2b214892a46b6e822200fc6046889ff3 +d0adbfe5d5151bc1213172303627039d67e15635 diff --git a/packages/golang-1-linux/version b/packages/golang-1-linux/version index bae5c7f667..49340f5ac7 100644 --- a/packages/golang-1-linux/version +++ b/packages/golang-1-linux/version @@ -1 +1 @@ -1.21.3 +1.21.3 \ No newline at end of file diff --git a/src/acceptance/assets/app/go_app/go.mod b/src/acceptance/assets/app/go_app/go.mod index 90cda4af24..355b0417dc 100644 --- a/src/acceptance/assets/app/go_app/go.mod +++ b/src/acceptance/assets/app/go_app/go.mod @@ -1,6 +1,6 @@ module code.cloudfoundry.org/app-autoscaler-release/src/acceptance/assets/app/go_app -go 1.21 +go 1.21.3 require ( github.com/cloudfoundry-community/go-cfenv v1.18.0 diff --git a/src/acceptance/go.mod b/src/acceptance/go.mod index 2fb907276f..8d1127e229 100644 --- a/src/acceptance/go.mod +++ b/src/acceptance/go.mod @@ -1,6 +1,6 @@ module acceptance -go 1.21 +go 1.21.3 require ( github.com/cloudfoundry/cf-test-helpers/v2 v2.9.0 diff --git a/src/autoscaler/go.mod b/src/autoscaler/go.mod index 5d154da184..16067a07d8 100644 --- a/src/autoscaler/go.mod +++ b/src/autoscaler/go.mod @@ -1,6 +1,6 @@ module code.cloudfoundry.org/app-autoscaler/src/autoscaler -go 1.21 +go 1.21.3 require ( code.cloudfoundry.org/cfhttp/v2 v2.0.1-0.20230113212937-05beac96f8c7 diff --git a/src/changelog/go.mod b/src/changelog/go.mod index 5c2ed88a3c..a31f2e17fa 100644 --- a/src/changelog/go.mod +++ b/src/changelog/go.mod @@ -1,6 +1,6 @@ module changelog -go 1.21 +go 1.21.3 require ( github.com/Masterminds/semver/v3 v3.2.1 diff --git a/src/changeloglockcleaner/go.mod b/src/changeloglockcleaner/go.mod index f1cdeae121..a63ea67c61 100644 --- a/src/changeloglockcleaner/go.mod +++ b/src/changeloglockcleaner/go.mod @@ -1,6 +1,6 @@ module changeloglockcleaner -go 1.21 +go 1.21.3 require ( github.com/go-sql-driver/mysql v1.8.0 From ae8652d82e16e785638f727c2aad1d5cca96094d Mon Sep 17 00:00:00 2001 From: geigerj0 <112163019+geigerj0@users.noreply.github.com> Date: Tue, 12 Mar 2024 14:19:09 +0100 Subject: [PATCH 2/6] bump ogen --- src/acceptance/assets/app/go_app/go.mod | 6 +++--- src/acceptance/assets/app/go_app/go.sum | 15 ++++++++------- src/autoscaler/go.mod | 2 +- src/autoscaler/go.sum | 4 ++-- 4 files changed, 14 insertions(+), 13 deletions(-) diff --git a/src/acceptance/assets/app/go_app/go.mod b/src/acceptance/assets/app/go_app/go.mod index 355b0417dc..aabb48df54 100644 --- a/src/acceptance/assets/app/go_app/go.mod +++ b/src/acceptance/assets/app/go_app/go.mod @@ -14,7 +14,7 @@ require ( github.com/json-iterator/go v1.1.12 github.com/maxbrunsfeld/counterfeiter/v6 v6.8.1 github.com/mitchellh/mapstructure v1.5.0 - github.com/ogen-go/ogen v0.82.0 + github.com/ogen-go/ogen v0.83.0 github.com/onsi/ginkgo/v2 v2.16.0 github.com/onsi/gomega v1.31.1 github.com/prometheus/procfs v0.13.0 @@ -62,12 +62,12 @@ require ( go.uber.org/multierr v1.11.0 // indirect golang.org/x/arch v0.7.0 // indirect golang.org/x/crypto v0.21.0 // indirect - golang.org/x/mod v0.15.0 // indirect + golang.org/x/mod v0.16.0 // indirect golang.org/x/net v0.22.0 // indirect golang.org/x/sync v0.6.0 // indirect golang.org/x/sys v0.18.0 // indirect golang.org/x/text v0.14.0 // indirect - golang.org/x/tools v0.18.0 // indirect + golang.org/x/tools v0.19.0 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect diff --git a/src/acceptance/assets/app/go_app/go.sum b/src/acceptance/assets/app/go_app/go.sum index 58da788484..00f034eb6a 100644 --- a/src/acceptance/assets/app/go_app/go.sum +++ b/src/acceptance/assets/app/go_app/go.sum @@ -99,8 +99,8 @@ github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M= github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= -github.com/ogen-go/ogen v0.82.0 h1:Jh4fg63sxpDDBzUT/UrNFWcH7t4wzP9+DAoOq6R4PsU= -github.com/ogen-go/ogen v0.82.0/go.mod h1:II7WsIh431hU0wl13u/bzyYgzTQQL/rCOWQxq4AWyJM= +github.com/ogen-go/ogen v0.83.0 h1:YGlYWjRf7ojwJJx+FG01iHf6/0i+0svt49cuvDGPr64= +github.com/ogen-go/ogen v0.83.0/go.mod h1:NFn616zR+/DPsq8rPoezaHlhKcNQzlYfo5gUieW8utI= github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.8.0 h1:VkHVNpR4iVnU8XQR6DBm8BqYjN7CRzw+xKUbVVbbW9w= github.com/onsi/ginkgo v1.8.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= @@ -133,8 +133,9 @@ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= -github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= +github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= +github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS4MhqMhdFk5YI= github.com/twitchyliquid64/golang-asm v0.15.1/go.mod h1:a1lVb/DtPvCB8fslRZhAngC2+aY1QWCk3Cedj/Gdt08= github.com/ugorji/go/codec v1.2.12 h1:9LC83zGrHhuUA9l16C9AHXAqEV/2wBQ4nkvumAE65EE= @@ -164,8 +165,8 @@ golang.org/x/crypto v0.21.0 h1:X31++rzVUdKhX5sWmSOFZxx8UW/ldWx55cbf08iNAMA= golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOMs= golang.org/x/exp v0.0.0-20240222234643-814bf88cf225 h1:LfspQV/FYTatPTr/3HzIcmiUFH7PGP+OQ6mgDYo3yuQ= golang.org/x/exp v0.0.0-20240222234643-814bf88cf225/go.mod h1:CxmFvTBINI24O/j8iY7H1xHzx2i4OsyguNBmN/uPtqc= -golang.org/x/mod v0.15.0 h1:SernR4v+D55NyBH2QiEQrlBAnj1ECL6AGrA5+dPaMY8= -golang.org/x/mod v0.15.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= +golang.org/x/mod v0.16.0 h1:QX4fJ0Rr5cPQCF7O9lh9Se4pmwfwskqZfq5moyldzic= +golang.org/x/mod v0.16.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.22.0 h1:9sGLhx7iRIHEiX0oAJ3MRZMUCElJgy7Br1nO+AMN3Tc= golang.org/x/net v0.22.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg= @@ -181,8 +182,8 @@ golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= -golang.org/x/tools v0.18.0 h1:k8NLag8AGHnn+PHbl7g43CtqZAwG60vZkLqgyZgIHgQ= -golang.org/x/tools v0.18.0/go.mod h1:GL7B4CwcLLeo59yx/9UWWuNOW1n3VZ4f5axWfML7Lcg= +golang.org/x/tools v0.19.0 h1:tfGCXNR1OsFG+sVdLAitlpjAvD/I6dHDKnYrpEZUHkw= +golang.org/x/tools v0.19.0/go.mod h1:qoJWxmGSIBmAeriMx19ogtrEPrGtDbPK634QFIcLAhc= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= diff --git a/src/autoscaler/go.mod b/src/autoscaler/go.mod index 16067a07d8..7e49ef6650 100644 --- a/src/autoscaler/go.mod +++ b/src/autoscaler/go.mod @@ -23,7 +23,7 @@ require ( github.com/jmoiron/sqlx v1.3.5 github.com/maxbrunsfeld/counterfeiter/v6 v6.8.1 github.com/nu7hatch/gouuid v0.0.0-20131221200532-179d4d0c4d8d - github.com/ogen-go/ogen v0.82.0 + github.com/ogen-go/ogen v0.83.0 github.com/onsi/ginkgo/v2 v2.16.0 github.com/onsi/gomega v1.31.1 github.com/patrickmn/go-cache v2.1.0+incompatible diff --git a/src/autoscaler/go.sum b/src/autoscaler/go.sum index 790b53b53d..96fc53498d 100644 --- a/src/autoscaler/go.sum +++ b/src/autoscaler/go.sum @@ -919,8 +919,8 @@ github.com/nu7hatch/gouuid v0.0.0-20131221200532-179d4d0c4d8d/go.mod h1:YUTz3bUH github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE= github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU= -github.com/ogen-go/ogen v0.82.0 h1:Jh4fg63sxpDDBzUT/UrNFWcH7t4wzP9+DAoOq6R4PsU= -github.com/ogen-go/ogen v0.82.0/go.mod h1:II7WsIh431hU0wl13u/bzyYgzTQQL/rCOWQxq4AWyJM= +github.com/ogen-go/ogen v0.83.0 h1:YGlYWjRf7ojwJJx+FG01iHf6/0i+0svt49cuvDGPr64= +github.com/ogen-go/ogen v0.83.0/go.mod h1:NFn616zR+/DPsq8rPoezaHlhKcNQzlYfo5gUieW8utI= github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk= github.com/onsi/ginkgo v1.16.4/go.mod h1:dX+/inL/fNMqNlz0e9LfyB9TswhZpCVdJM/Z6Vvnwo0= From a43acee683816df2794c6e2eb4f7cc3cad73d9a9 Mon Sep 17 00:00:00 2001 From: geigerj0 <112163019+geigerj0@users.noreply.github.com> Date: Wed, 13 Mar 2024 13:31:49 +0100 Subject: [PATCH 3/6] revert golang bump --- packages/golang-1-linux/spec.lock | 2 +- packages/golang-1-linux/vendored-commit | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/golang-1-linux/spec.lock b/packages/golang-1-linux/spec.lock index b4a0abaed8..4438b3f5f3 100644 --- a/packages/golang-1-linux/spec.lock +++ b/packages/golang-1-linux/spec.lock @@ -1,2 +1,2 @@ name: golang-1-linux -fingerprint: 6aad26c0e11f1c08fe8408af93d386eed66fd4c29170b8d9a034677eaa4f61d9 +fingerprint: 2bba3dc3872d3475f3aa9476963ed92dae8471d15419714082e19d2b34a0e01e diff --git a/packages/golang-1-linux/vendored-commit b/packages/golang-1-linux/vendored-commit index 4a12bf3e90..adc943747e 100644 --- a/packages/golang-1-linux/vendored-commit +++ b/packages/golang-1-linux/vendored-commit @@ -1 +1 @@ -d0adbfe5d5151bc1213172303627039d67e15635 +aeaff4cc2b214892a46b6e822200fc6046889ff3 From 1031e52ceea447eabae84afbcaeb03371fc23e57 Mon Sep 17 00:00:00 2001 From: geigerj0 <112163019+geigerj0@users.noreply.github.com> Date: Wed, 13 Mar 2024 13:32:11 +0100 Subject: [PATCH 4/6] revert fixed golang version --- ci/autoscaler/tasks/update-sdk/update_golang_package.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/ci/autoscaler/tasks/update-sdk/update_golang_package.sh b/ci/autoscaler/tasks/update-sdk/update_golang_package.sh index 54d721a7a9..0eb0567b52 100755 --- a/ci/autoscaler/tasks/update-sdk/update_golang_package.sh +++ b/ci/autoscaler/tasks/update-sdk/update_golang_package.sh @@ -11,7 +11,6 @@ golang_dir="$(realpath -e "${golang_dir}")" export golang_dir golang_version=$(cat "${golang_dir}/packages/golang-1-linux/version") -golang_version="1.21.3" step "updating go.work file with golang version ${golang_version}" go work edit -go "${golang_version}" "${autoscaler_dir}/go.work" From ee49a6917f23db7a9e9d7822fd7f440abb9fdb98 Mon Sep 17 00:00:00 2001 From: geigerj0 <112163019+geigerj0@users.noreply.github.com> Date: Wed, 13 Mar 2024 13:32:46 +0100 Subject: [PATCH 5/6] revert --- packages/golang-1-linux/version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/golang-1-linux/version b/packages/golang-1-linux/version index 49340f5ac7..bae5c7f667 100644 --- a/packages/golang-1-linux/version +++ b/packages/golang-1-linux/version @@ -1 +1 @@ -1.21.3 \ No newline at end of file +1.21.3 From aa9640184d8abc75932f269c72c11d4051251be8 Mon Sep 17 00:00:00 2001 From: geigerj0 <112163019+geigerj0@users.noreply.github.com> Date: Wed, 13 Mar 2024 13:34:12 +0100 Subject: [PATCH 6/6] revert --- .final_builds/packages/golang-1-linux/index.yml | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/.final_builds/packages/golang-1-linux/index.yml b/.final_builds/packages/golang-1-linux/index.yml index 4c77986b14..0921640d8b 100644 --- a/.final_builds/packages/golang-1-linux/index.yml +++ b/.final_builds/packages/golang-1-linux/index.yml @@ -15,6 +15,10 @@ builds: version: 2336380dbf01a44020813425f92be34685ce118bf4767406c461771cfef14fc9 blobstore_id: 9a9ec445-3d59-4f58-41a6-0a982553fe0b sha1: sha256:c440fd7aa6d179a6891f765c46f69fa2b6cbadd8da3b019a4fb27fc9001a4f1f + 2bba3dc3872d3475f3aa9476963ed92dae8471d15419714082e19d2b34a0e01e: + version: 2bba3dc3872d3475f3aa9476963ed92dae8471d15419714082e19d2b34a0e01e + blobstore_id: 694ff607-3c1e-4f90-41ca-c4c5d7126b63 + sha1: sha256:53f80714c8acd709ad39e7619f89af7766854a8d81be21d698aeaf5fd5d6e090 2598f3c61c5a9e674fb01f9d5c11ecdbaeb18622b0296ade3fed5e774ee15421: version: 2598f3c61c5a9e674fb01f9d5c11ecdbaeb18622b0296ade3fed5e774ee15421 blobstore_id: bb850386-19ad-4ef1-7348-e7942b50b929 @@ -23,10 +27,6 @@ builds: version: 29f2024e7d815be0694944c3c3c9512914a36a31d5fa1b2cbd2452c8d331ce90 blobstore_id: e76cbbf4-34ca-4b05-5e99-21f0847f41fb sha1: sha256:74e09558cd565077109cf445c90c3a1f8df661e8bbfdf04cc6f6693714f99304 - 2bba3dc3872d3475f3aa9476963ed92dae8471d15419714082e19d2b34a0e01e: - version: 2bba3dc3872d3475f3aa9476963ed92dae8471d15419714082e19d2b34a0e01e - blobstore_id: 694ff607-3c1e-4f90-41ca-c4c5d7126b63 - sha1: sha256:53f80714c8acd709ad39e7619f89af7766854a8d81be21d698aeaf5fd5d6e090 4c3c9f041ae80eb4373ed31efe56164d0f4733456c3e110d62dd92d310d6b86e: version: 4c3c9f041ae80eb4373ed31efe56164d0f4733456c3e110d62dd92d310d6b86e blobstore_id: 164a9df5-ab52-441f-7a07-c257b39e8d44 @@ -39,10 +39,6 @@ builds: version: 5e5e7040d67e2b9a4696bbce1b6b37a16b8bb7d0a220ddda8f3918ecce4b9a2c blobstore_id: 55ae0bcb-1d1a-47e5-650e-72f113b34923 sha1: sha256:b129155ee29328ba69d2447dd8bba56fb002e93caf3c7062fae3374190f8b5ca - 6aad26c0e11f1c08fe8408af93d386eed66fd4c29170b8d9a034677eaa4f61d9: - version: 6aad26c0e11f1c08fe8408af93d386eed66fd4c29170b8d9a034677eaa4f61d9 - blobstore_id: b17ac9cd-b3de-48ba-7e67-ce7209ee8a2f - sha1: sha256:6742860369e7ce134e8ca4a037917d386ef6b0b92338a5b46114baee4d3cea19 6f86822e163425375f3a1b9d781b678f30fd4b6ee619b033fcf5e7e18563e74e: version: 6f86822e163425375f3a1b9d781b678f30fd4b6ee619b033fcf5e7e18563e74e blobstore_id: 0a69914c-05f2-4397-4cc1-390d8b2b6640