From ff3962d19b85fd5a531c31160a8d885f201cae31 Mon Sep 17 00:00:00 2001 From: "grafana-delivery-bot[bot]" <132647405+grafana-delivery-bot[bot]@users.noreply.github.com> Date: Tue, 24 Oct 2023 18:41:55 +0300 Subject: [PATCH] [v10.2.x] CI: Temporarily disable arm build-tooling (#77067) CI: Temporarily disable arm build-tooling (#77064) (cherry picked from commit f7445777c7c1d5003411db3260d36ec1609b2850) Co-authored-by: Horst Gutmann --- pkg/build/config/variant.go | 7 +++-- pkg/build/config/versions.go | 17 +++++----- pkg/build/docker/init.go | 2 +- pkg/build/packaging/artifacts.go | 53 ++++++++++++++++---------------- 4 files changed, 42 insertions(+), 37 deletions(-) diff --git a/pkg/build/config/variant.go b/pkg/build/config/variant.go index 4fde6a89a74..6b476ed95e6 100644 --- a/pkg/build/config/variant.go +++ b/pkg/build/config/variant.go @@ -16,9 +16,10 @@ const ( ) var AllVariants = []Variant{ - VariantArmV6, - VariantArmV7, - VariantArmV7Musl, + // https://github.com/golang/go/issues/58425 disabling arm builds until go issue is resolved + // VariantArmV6, + // VariantArmV7, + // VariantArmV7Musl, VariantArm64, VariantArm64Musl, VariantDarwinAmd64, diff --git a/pkg/build/config/versions.go b/pkg/build/config/versions.go index 8decc72593c..ec28fe51b35 100644 --- a/pkg/build/config/versions.go +++ b/pkg/build/config/versions.go @@ -101,9 +101,10 @@ var Versions = VersionMap{ }, ReleaseBranchMode: { Variants: []Variant{ - VariantArmV6, - VariantArmV7, - VariantArmV7Musl, + // https://github.com/golang/go/issues/58425 disabling arm builds until go issue is resolved + // VariantArmV6, + // VariantArmV7, + // VariantArmV7Musl, VariantArm64, VariantArm64Musl, VariantDarwinAmd64, @@ -136,9 +137,10 @@ var Versions = VersionMap{ }, TagMode: { Variants: []Variant{ - VariantArmV6, - VariantArmV7, - VariantArmV7Musl, + // https://github.com/golang/go/issues/58425 disabling arm builds until go issue is resolved + // VariantArmV6, + // VariantArmV7, + // VariantArmV7Musl, VariantArm64, VariantArm64Musl, VariantDarwinAmd64, @@ -155,7 +157,8 @@ var Versions = VersionMap{ Architectures: []Architecture{ ArchAMD64, ArchARM64, - ArchARMv7, + // https://github.com/golang/go/issues/58425 disabling arm builds until go issue is resolved + // ArchARMv7, }, Distribution: []Distribution{ Alpine, diff --git a/pkg/build/docker/init.go b/pkg/build/docker/init.go index c7262613b2b..94fe236aa52 100644 --- a/pkg/build/docker/init.go +++ b/pkg/build/docker/init.go @@ -8,7 +8,7 @@ import ( ) // AllArchs is a list of all supported Docker image architectures. -var AllArchs = []string{"amd64", "armv7", "arm64"} +var AllArchs = []string{"amd64", "arm64"} // emulatorImage is the docker image used as the cross-platform emulator var emulatorImage = "tonistiigi/binfmt:qemu-v7.0.0" diff --git a/pkg/build/packaging/artifacts.go b/pkg/build/packaging/artifacts.go index bdce67170e1..36c1e3258e5 100644 --- a/pkg/build/packaging/artifacts.go +++ b/pkg/build/packaging/artifacts.go @@ -81,32 +81,33 @@ var ArtifactConfigs = []buildArtifact{ Arch: "arm64", urlPostfix: ".linux-arm64.tar.gz", }, - { - Os: debOS, - Arch: "armv7", - urlPostfix: "_armhf.deb", - }, - { - Os: debOS, - Arch: "armv6", - packagePostfix: "-rpi", - urlPostfix: "_armhf.deb", - }, - { - Os: rhelOS, - Arch: "armv7", - urlPostfix: ".armhfp.rpm", - }, - { - Os: "linux", - Arch: "armv6", - urlPostfix: ".linux-armv6.tar.gz", - }, - { - Os: "linux", - Arch: "armv7", - urlPostfix: ".linux-armv7.tar.gz", - }, + // https://github.com/golang/go/issues/58425 disabling arm builds until go issue is resolved + // { + // Os: debOS, + // Arch: "armv7", + // urlPostfix: "_armhf.deb", + // }, + // { + // Os: debOS, + // Arch: "armv6", + // packagePostfix: "-rpi", + // urlPostfix: "_armhf.deb", + // }, + // { + // Os: rhelOS, + // Arch: "armv7", + // urlPostfix: ".armhfp.rpm", + // }, + // { + // Os: "linux", + // Arch: "armv6", + // urlPostfix: ".linux-armv6.tar.gz", + // }, + // { + // Os: "linux", + // Arch: "armv7", + // urlPostfix: ".linux-armv7.tar.gz", + // }, { Os: "darwin", Arch: "amd64",