From fb44fe7ed46ab287715769c30c21a3b42332cb86 Mon Sep 17 00:00:00 2001 From: Dimitris Sotirakis Date: Fri, 29 Sep 2023 20:33:01 +0300 Subject: [PATCH] Bug: Exclude 32-bit `arm` builds (#75448) * Exclude 32 bit arm builds * Bump grabpl - remove arm/v7 from build.star --- .drone.yml | 32 ++++++++++---------- pkg/build/config/variant.go | 6 ++-- pkg/build/config/versions.go | 52 +++++++++++++++++--------------- pkg/build/docker/init.go | 2 +- pkg/build/packaging/artifacts.go | 52 ++++++++++++++++---------------- scripts/drone/steps/lib.star | 2 +- 6 files changed, 75 insertions(+), 71 deletions(-) diff --git a/.drone.yml b/.drone.yml index afee8af9463..89b29c02509 100644 --- a/.drone.yml +++ b/.drone.yml @@ -120,7 +120,7 @@ steps: name: identify-runner - commands: - mkdir -p bin - - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v3.0.41/grabpl + - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v3.0.42/grabpl - chmod +x bin/grabpl image: byrnedo/alpine-curl:0.1.8 name: grabpl @@ -467,7 +467,7 @@ steps: name: identify-runner - commands: - mkdir -p bin - - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v3.0.41/grabpl + - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v3.0.42/grabpl - chmod +x bin/grabpl image: byrnedo/alpine-curl:0.1.8 name: grabpl @@ -862,7 +862,7 @@ steps: name: clone-enterprise - commands: - mkdir -p bin - - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v3.0.41/grabpl + - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v3.0.42/grabpl - chmod +x bin/grabpl image: byrnedo/alpine-curl:0.1.8 name: grabpl @@ -1165,7 +1165,7 @@ steps: name: identify-runner - commands: - mkdir -p bin - - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v3.0.41/grabpl + - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v3.0.42/grabpl - chmod +x bin/grabpl image: byrnedo/alpine-curl:0.1.8 name: grabpl @@ -1417,7 +1417,7 @@ steps: name: identify-runner - commands: - mkdir -p bin - - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v3.0.41/grabpl + - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v3.0.42/grabpl - chmod +x bin/grabpl image: byrnedo/alpine-curl:0.1.8 name: grabpl @@ -1871,7 +1871,7 @@ services: steps: - commands: - mkdir -p bin - - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v3.0.41/grabpl + - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v3.0.42/grabpl - chmod +x bin/grabpl image: byrnedo/alpine-curl:0.1.8 name: grabpl @@ -2009,7 +2009,7 @@ steps: name: identify-runner - commands: - $$ProgressPreference = "SilentlyContinue" - - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v3.0.41/windows/grabpl.exe + - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v3.0.42/windows/grabpl.exe -OutFile grabpl.exe image: grafana/ci-wix:0.1.1 name: windows-init @@ -2167,7 +2167,7 @@ steps: name: identify-runner - commands: - mkdir -p bin - - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v3.0.41/grabpl + - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v3.0.42/grabpl - chmod +x bin/grabpl image: byrnedo/alpine-curl:0.1.8 name: grabpl @@ -2539,7 +2539,7 @@ steps: name: identify-runner - commands: - mkdir -p bin - - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v3.0.41/grabpl + - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v3.0.42/grabpl - chmod +x bin/grabpl image: byrnedo/alpine-curl:0.1.8 name: grabpl @@ -2789,7 +2789,7 @@ steps: name: identify-runner - commands: - $$ProgressPreference = "SilentlyContinue" - - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v3.0.41/windows/grabpl.exe + - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v3.0.42/windows/grabpl.exe -OutFile grabpl.exe failure: ignore image: grafana/ci-wix:0.1.1 @@ -2953,7 +2953,7 @@ steps: name: identify-runner - commands: - mkdir -p bin - - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v3.0.41/grabpl + - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v3.0.42/grabpl - chmod +x bin/grabpl image: byrnedo/alpine-curl:0.1.8 name: grabpl @@ -3234,7 +3234,7 @@ steps: name: identify-runner - commands: - mkdir -p bin - - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v3.0.41/grabpl + - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v3.0.42/grabpl - chmod +x bin/grabpl image: byrnedo/alpine-curl:0.1.8 name: grabpl @@ -3383,7 +3383,7 @@ services: steps: - commands: - mkdir -p bin - - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v3.0.41/grabpl + - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v3.0.42/grabpl - chmod +x bin/grabpl image: byrnedo/alpine-curl:0.1.8 name: grabpl @@ -3506,7 +3506,7 @@ steps: name: identify-runner - commands: - $$ProgressPreference = "SilentlyContinue" - - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v3.0.41/windows/grabpl.exe + - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v3.0.42/windows/grabpl.exe -OutFile grabpl.exe image: grafana/ci-wix:0.1.1 name: windows-init @@ -3582,7 +3582,7 @@ services: steps: - commands: - mkdir -p bin - - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v3.0.41/grabpl + - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v3.0.42/grabpl - chmod +x bin/grabpl image: byrnedo/alpine-curl:0.1.8 name: grabpl @@ -4342,6 +4342,6 @@ kind: secret name: gcr_credentials --- kind: signature -hmac: 95a078ec021e3a8992d25bb971e51cd8b0cdc7952c437ce951ee7a98c1448bfb +hmac: 5307341889805ea48cad7796b9a5c64bcc6c42f58f12b831fe3b3e7b2422c72d ... diff --git a/pkg/build/config/variant.go b/pkg/build/config/variant.go index 4fde6a89a74..e9b2d56deab 100644 --- a/pkg/build/config/variant.go +++ b/pkg/build/config/variant.go @@ -16,9 +16,9 @@ const ( ) var AllVariants = []Variant{ - VariantArmV6, - VariantArmV7, - VariantArmV7Musl, + // VariantArmV6, + // VariantArmV7, + // VariantArmV7Musl, VariantArm64, VariantArm64Musl, VariantDarwinAmd64, diff --git a/pkg/build/config/versions.go b/pkg/build/config/versions.go index aa618e90358..4c6d2c357d9 100644 --- a/pkg/build/config/versions.go +++ b/pkg/build/config/versions.go @@ -1,7 +1,5 @@ package config -const PublicBucket = "grafana-downloads" - var Versions = VersionMap{ PullRequestMode: { Variants: []Variant{ @@ -9,8 +7,9 @@ var Versions = VersionMap{ VariantLinuxAmd64Musl, VariantDarwinAmd64, VariantWindowsAmd64, - VariantArm64, - VariantArm64Musl, + // https://github.com/golang/go/issues/58425 disabling arm builds until go issue is resolved + // VariantArm64, + // VariantArm64Musl, }, PluginSignature: PluginSignature{ Sign: false, @@ -29,9 +28,10 @@ var Versions = VersionMap{ }, MainMode: { 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, @@ -48,7 +48,8 @@ var Versions = VersionMap{ Architectures: []Architecture{ ArchAMD64, ArchARM64, - ArchARMv7, // GOARCH=ARM is used for both armv6 and armv7. They are differentiated by the GOARM variable. + // https://github.com/golang/go/issues/58425 disabling arm builds until go issue is resolved + // ArchARMv7, // GOARCH=ARM is used for both armv6 and armv7. They are differentiated by the GOARM variable. }, Distribution: []Distribution{ Alpine, @@ -64,9 +65,10 @@ var Versions = VersionMap{ }, DownstreamMode: { 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, @@ -83,7 +85,7 @@ var Versions = VersionMap{ Architectures: []Architecture{ ArchAMD64, ArchARM64, - ArchARMv7, // GOARCH=ARM is used for both armv6 and armv7. They are differentiated by the GOARM variable. + // ArchARMv7, // GOARCH=ARM is used for both armv6 and armv7. They are differentiated by the GOARM variable. }, Distribution: []Distribution{ Alpine, @@ -98,9 +100,9 @@ var Versions = VersionMap{ }, ReleaseBranchMode: { Variants: []Variant{ - VariantArmV6, - VariantArmV7, - VariantArmV7Musl, + // VariantArmV6, + // VariantArmV7, + // VariantArmV7Musl, VariantArm64, VariantArm64Musl, VariantDarwinAmd64, @@ -117,7 +119,7 @@ var Versions = VersionMap{ Architectures: []Architecture{ ArchAMD64, ArchARM64, - ArchARMv7, + // ArchARMv7, }, Distribution: []Distribution{ Alpine, @@ -133,9 +135,9 @@ var Versions = VersionMap{ }, TagMode: { Variants: []Variant{ - VariantArmV6, - VariantArmV7, - VariantArmV7Musl, + // VariantArmV6, + // VariantArmV7, + // VariantArmV7Musl, VariantArm64, VariantArm64Musl, VariantDarwinAmd64, @@ -152,7 +154,7 @@ var Versions = VersionMap{ Architectures: []Architecture{ ArchAMD64, ArchARM64, - ArchARMv7, + // ArchARMv7, }, Distribution: []Distribution{ Alpine, @@ -171,9 +173,10 @@ var Versions = VersionMap{ }, Enterprise2Mode: { 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, @@ -190,7 +193,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..dce2a5f96db 100644 --- a/pkg/build/packaging/artifacts.go +++ b/pkg/build/packaging/artifacts.go @@ -81,32 +81,32 @@ 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", - }, + // { + // 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", diff --git a/scripts/drone/steps/lib.star b/scripts/drone/steps/lib.star index 3951c2d12db..fc1660da0ce 100644 --- a/scripts/drone/steps/lib.star +++ b/scripts/drone/steps/lib.star @@ -20,7 +20,7 @@ load( "windows_images", ) -grabpl_version = "v3.0.41" +grabpl_version = "v3.0.42" trigger_oss = { "repo": [