Skip to content

Commit

Permalink
revert changes made to rerelease the 1.22.6 golang-debian image (#1537)
Browse files Browse the repository at this point in the history
* Revert "hardcode checksum check to unblock 1.22.6 debian release (#1536)"

This reverts commit 7a3624f.

* Revert "rerelease 1.22.6 golang-debian image (#1535)"

This reverts commit 2aaba3c.

* Revert "rerelease 1.22.6 golang-debian image (#1534)"

This reverts commit e48c7ba.
  • Loading branch information
vineeth-bandi authored Sep 21, 2024
1 parent 7a3624f commit 946434f
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 6 deletions.
2 changes: 1 addition & 1 deletion builder-base/checksums/go-go1.22-amd64-checksum
Original file line number Diff line number Diff line change
@@ -1 +1 @@
999805bed7d9039ec3da1a53bfbcafc13e367da52aa823cb60b68ba22d44c616 /home/prow/go/src/github.com/aws/eks-distro-build-tooling/builder-base/tmp/golang-downloads/linux/amd64/go1.22.6.linux-amd64.tar.gz
fc5d49b7a5035f1f1b265c17aa86e9819e6dc9af8260ad61430ee7fbe27881bb /home/prow/go/src/github.com/aws/eks-distro-build-tooling/builder-base/tmp/golang-downloads/linux/amd64/go1.22.7.linux-amd64.tar.gz
2 changes: 1 addition & 1 deletion builder-base/checksums/go-go1.22-arm64-checksum
Original file line number Diff line number Diff line change
@@ -1 +1 @@
c15fa895341b8eaf7f219fada25c36a610eb042985dc1a912410c1c90098eaf2 /home/prow/go/src/github.com/aws/eks-distro-build-tooling/builder-base/tmp/golang-downloads/linux/arm64/go1.22.6.linux-arm64.tar.gz
ed695684438facbd7e0f286c30b7bc2411cfc605516d8127dc25c62fe5b03885 /home/prow/go/src/github.com/aws/eks-distro-build-tooling/builder-base/tmp/golang-downloads/linux/arm64/go1.22.7.linux-arm64.tar.gz
2 changes: 1 addition & 1 deletion builder-base/versions.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ GOLANG_VERSION_118: 1.18.10-8
GOLANG_VERSION_119: 1.19.13-14
GOLANG_VERSION_120: 1.20.14-16
GOLANG_VERSION_121: 1.21.13-0
GOLANG_VERSION_122: 1.22.6-0
GOLANG_VERSION_122: 1.22.7-0
GOLANG_VERSION_123: 1.23.1-0
GOSS_VERSION: 3.1.4
GOVC_VERSION: 0.34.2
Expand Down
2 changes: 1 addition & 1 deletion eks-distro-base/golang_versions.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@ golang:
GOLANG_1.19_FULL_VERSION: 1.19.13-14
GOLANG_1.20_FULL_VERSION: 1.20.14-16
GOLANG_1.21_FULL_VERSION: 1.21.13-0
GOLANG_1.22_FULL_VERSION: 1.22.6-0
GOLANG_1.22_FULL_VERSION: 1.22.7-0
GOLANG_1.23_FULL_VERSION: 1.23.1-0
3 changes: 1 addition & 2 deletions projects/golang/go/scripts/get_upstream_golang.sh
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,7 @@ function build::go::download {
local filename="$outputDir/${arch}/$version.${arch/\//-}.tar.gz"
if [ ! -f $filename ]; then
curl -sSLf --retry 5 "https://go.dev/dl/$version.${arch/\//-}.tar.gz" -o $filename --create-dirs
# TODO: REVERT THIS
sha256sum=999805bed7d9039ec3da1a53bfbcafc13e367da52aa823cb60b68ba22d44c616
sha256sum=$(curl -sSLf --retry 5 "https://go.dev/dl/?mode=json" | jq -r --arg tar "$version.${arch/\//-}.tar.gz" '.[].files[] | if .filename == $tar then .sha256 else "" end' | xargs)

if [[ $(sha256sum ${filename} | cut -d ' ' -f1) != "${sha256sum}" ]]; then
echo "CHECKSUMs don't match"
Expand Down

0 comments on commit 946434f

Please sign in to comment.