Skip to content

Commit

Permalink
updates buildkit to 0.18.2 and fixes building locally
Browse files Browse the repository at this point in the history
  • Loading branch information
@jaxesn
jaxesn committed Dec 18, 2024
1 parent 9229ad4 commit ba5f41d
Show file tree
Hide file tree
Showing 11 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion builder-base/checksums/buildkit-amd64-checksum
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
fcd9149b876fba0404365cb021937e2435cad443d2a31b2bc5360298f900dfd7 buildkit-v0.12.5.linux-amd64.tar.gz
5662f23cfa5e475ff50932dd2b71d2c5812928fad631d1e8c9f8f5592a4c1568 buildkit-v0.18.2.linux-amd64.tar.gz
2 changes: 1 addition & 1 deletion builder-base/checksums/buildkit-arm64-checksum
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
45624b083f88c1b0160aebe9f9589c723900b248ec36bda46b97af2698bbfd1d buildkit-v0.12.5.linux-arm64.tar.gz
de0ae01abc689102de6a765f8f40a30e86203897d3a7b44511a3aa66824bbc48 buildkit-v0.18.2.linux-arm64.tar.gz
2 changes: 1 addition & 1 deletion builder-base/checksums/go-go1.21-amd64-checksum
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
502fc16d5910562461e6a6631fb6377de2322aad7304bf2bcd23500ba9dab4a7 /home/prow/go/src/github.com/aws/eks-distro-build-tooling/builder-base/tmp/golang-downloads/linux/amd64/go1.21.13.linux-amd64.tar.gz
502fc16d5910562461e6a6631fb6377de2322aad7304bf2bcd23500ba9dab4a7 go1.21.13.linux-amd64.tar.gz
2 changes: 1 addition & 1 deletion builder-base/checksums/go-go1.21-arm64-checksum
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2ca2d70dc9c84feef959eb31f2a5aac33eefd8c97fe48f1548886d737bffabd4 /home/prow/go/src/github.com/aws/eks-distro-build-tooling/builder-base/tmp/golang-downloads/linux/arm64/go1.21.13.linux-arm64.tar.gz
2ca2d70dc9c84feef959eb31f2a5aac33eefd8c97fe48f1548886d737bffabd4 go1.21.13.linux-arm64.tar.gz
2 changes: 1 addition & 1 deletion builder-base/checksums/go-go1.22-amd64-checksum
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
736ce492a19d756a92719a6121226087ccd91b652ed5caec40ad6dbfb2252092 /home/prow/go/src/github.com/aws/eks-distro-build-tooling/builder-base/tmp/golang-downloads/linux/amd64/go1.22.10.linux-amd64.tar.gz
736ce492a19d756a92719a6121226087ccd91b652ed5caec40ad6dbfb2252092 go1.22.10.linux-amd64.tar.gz
2 changes: 1 addition & 1 deletion builder-base/checksums/go-go1.22-arm64-checksum
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
5213c5e32fde3bd7da65516467b7ffbfe40d2bb5a5f58105e387eef450583eec /home/prow/go/src/github.com/aws/eks-distro-build-tooling/builder-base/tmp/golang-downloads/linux/arm64/go1.22.10.linux-arm64.tar.gz
5213c5e32fde3bd7da65516467b7ffbfe40d2bb5a5f58105e387eef450583eec go1.22.10.linux-arm64.tar.gz
2 changes: 1 addition & 1 deletion builder-base/checksums/go-go1.23-amd64-checksum
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
6924efde5de86fe277676e929dc9917d466efa02fb934197bc2eba35d5680971 /home/prow/go/src/github.com/aws/eks-distro-build-tooling/builder-base/tmp/golang-downloads/linux/amd64/go1.23.4.linux-amd64.tar.gz
6924efde5de86fe277676e929dc9917d466efa02fb934197bc2eba35d5680971 go1.23.4.linux-amd64.tar.gz
2 changes: 1 addition & 1 deletion builder-base/checksums/go-go1.23-arm64-checksum
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
16e5017863a7f6071363782b1b8042eb12c6ca4f4cd71528b2123f0a1275b13e /home/prow/go/src/github.com/aws/eks-distro-build-tooling/builder-base/tmp/golang-downloads/linux/arm64/go1.23.4.linux-arm64.tar.gz
16e5017863a7f6071363782b1b8042eb12c6ca4f4cd71528b2123f0a1275b13e go1.23.4.linux-arm64.tar.gz
2 changes: 1 addition & 1 deletion builder-base/scripts/download_golang.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ function build::go::download {
curl -sSLf --retry 5 "https://go.dev/dl/go$version.${arch/\//-}.tar.gz" -o $filename --create-dirs

go_major_version=$(if [[ $(echo "$version" | awk -F'.' '{print NF}') -ge 3 ]]; then echo ${version%.*}; else echo ${version%-*}; fi)
sha256sum -c $SCRIPT_ROOT/../checksums/go-go$go_major_version-${arch##*/}-checksum
(cd $(dirname $filename) && sha256sum -c $SCRIPT_ROOT/../checksums/go-go$go_major_version-${arch##*/}-checksum)
fi
done
}
Expand Down
2 changes: 1 addition & 1 deletion builder-base/scripts/update_shasums.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ for TARGETARCH in arm64 amd64; do
for v in $go_active_version; do
go_major_version=$(if [[ $(echo "$v" | awk -F'.' '{print NF}') -ge 3 ]]; then echo ${v%.*}; else echo ${v%-*}; fi)
sha256=$(curl -sSLf --retry 5 "https://go.dev/dl/?mode=json" | jq -r --arg tar "$v.linux-${TARGETARCH/\//-}.tar.gz" '.[].files[] | if .filename == $tar then .sha256 else "" end' | xargs)
echo "$sha256 /home/prow/go/src/github.com/aws/eks-distro-build-tooling/builder-base/tmp/golang-downloads/linux/$TARGETARCH/${v}.linux-$TARGETARCH.tar.gz" >"$CHECKSUMS_ROOT/checksums/go-$go_major_version-$TARGETARCH-checksum"
echo "$sha256 ${v}.linux-$TARGETARCH.tar.gz" >"$CHECKSUMS_ROOT/checksums/go-$go_major_version-$TARGETARCH-checksum"
done

# GOVC
Expand Down
2 changes: 1 addition & 1 deletion builder-base/versions.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
AMAZON_ECR_CRED_HELPER_VERSION: 0.6.0
ANSIBLE_VERSION: 2.15.10
BUILDKIT_VERSION: v0.12.5
BUILDKIT_VERSION: v0.18.2
GITHUB_CLI_VERSION: 2.21.1
GOLANG_VERSION_117: 1.17.13-6
GOLANG_VERSION_118: 1.18.10-8
Expand Down

0 comments on commit ba5f41d

Please sign in to comment.