From 8b7b34dd6af94ada45abe46b5b33898b98f8961b Mon Sep 17 00:00:00 2001 From: Victor Marin <36818606+mdvictor@users.noreply.github.com> Date: Mon, 18 Dec 2023 10:56:45 +0200 Subject: [PATCH] [v10.2.x] Re-add arm32 builds (#79619) Re-add arm32 builds (#79496) * Re-add arm32 builds * update grabpl version * make drone * make drone * format drone (cherry picked from commit 9dc015b595652881c39a119070429761284903aa) --- .drone.yml | 26 +++++++-------- pkg/build/config/versions.go | 52 ++++++++++++------------------ scripts/drone/pipelines/build.star | 3 +- scripts/drone/variables.star | 2 +- 4 files changed, 37 insertions(+), 46 deletions(-) diff --git a/.drone.yml b/.drone.yml index 631483c188e..e33b9507fd6 100644 --- a/.drone.yml +++ b/.drone.yml @@ -490,7 +490,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.42/grabpl + - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v3.0.46/grabpl - chmod +x bin/grabpl image: byrnedo/alpine-curl:0.1.8 name: grabpl @@ -558,8 +558,8 @@ steps: from_secret: drone_token - commands: - /src/grafana-build artifacts -a targz:grafana:linux/amd64 -a targz:grafana:linux/arm64 - --go-version=1.21.5 --yarn-cache=$$YARN_CACHE_FOLDER --build-id=$$DRONE_BUILD_NUMBER - --grafana-dir=$$PWD > packages.txt + -a targz:grafana:linux/arm/v7 --go-version=1.21.5 --yarn-cache=$$YARN_CACHE_FOLDER + --build-id=$$DRONE_BUILD_NUMBER --grafana-dir=$$PWD > packages.txt depends_on: - yarn-install image: grafana/grafana-build:main @@ -834,7 +834,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.42/grabpl + - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v3.0.46/grabpl - chmod +x bin/grabpl image: byrnedo/alpine-curl:0.1.8 name: grabpl @@ -1679,7 +1679,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.42/grabpl + - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v3.0.46/grabpl - chmod +x bin/grabpl image: byrnedo/alpine-curl:0.1.8 name: grabpl @@ -1746,8 +1746,8 @@ steps: name: build-frontend-packages - commands: - /src/grafana-build artifacts -a targz:grafana:linux/amd64 -a targz:grafana:linux/arm64 - --go-version=1.21.5 --yarn-cache=$$YARN_CACHE_FOLDER --build-id=$$DRONE_BUILD_NUMBER - --grafana-dir=$$PWD > packages.txt + -a targz:grafana:linux/arm/v7 --go-version=1.21.5 --yarn-cache=$$YARN_CACHE_FOLDER + --build-id=$$DRONE_BUILD_NUMBER --grafana-dir=$$PWD > packages.txt depends_on: - update-package-json-version image: grafana/grafana-build:main @@ -2120,7 +2120,7 @@ services: steps: - commands: - mkdir -p bin - - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v3.0.42/grabpl + - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v3.0.46/grabpl - chmod +x bin/grabpl image: byrnedo/alpine-curl:0.1.8 name: grabpl @@ -2318,7 +2318,7 @@ steps: name: identify-runner - commands: - $$ProgressPreference = "SilentlyContinue" - - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v3.0.42/windows/grabpl.exe + - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v3.0.46/windows/grabpl.exe -OutFile grabpl.exe image: grafana/ci-wix:0.1.1 name: windows-init @@ -2478,7 +2478,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.42/grabpl + - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v3.0.46/grabpl - chmod +x bin/grabpl image: byrnedo/alpine-curl:0.1.8 name: grabpl @@ -3128,7 +3128,7 @@ steps: name: identify-runner - commands: - $$ProgressPreference = "SilentlyContinue" - - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v3.0.42/windows/grabpl.exe + - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v3.0.46/windows/grabpl.exe -OutFile grabpl.exe failure: ignore image: grafana/ci-wix:0.1.1 @@ -3821,7 +3821,7 @@ services: steps: - commands: - mkdir -p bin - - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v3.0.42/grabpl + - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v3.0.46/grabpl - chmod +x bin/grabpl image: byrnedo/alpine-curl:0.1.8 name: grabpl @@ -4594,6 +4594,6 @@ kind: secret name: gcr_credentials --- kind: signature -hmac: e873c32a088f5afec63f5f20c6761d6466ab7c196e5f4e5a58bd2c20e9cae274 +hmac: 12429394739a8417d3302c90f2b33ffac3156b8fbceb4fe916499e33122edc7d ... diff --git a/pkg/build/config/versions.go b/pkg/build/config/versions.go index ec28fe51b35..d87c60d7ff0 100644 --- a/pkg/build/config/versions.go +++ b/pkg/build/config/versions.go @@ -7,9 +7,8 @@ var Versions = VersionMap{ VariantLinuxAmd64Musl, VariantDarwinAmd64, VariantWindowsAmd64, - // https://github.com/golang/go/issues/58425 disabling arm builds until go issue is resolved - // VariantArm64, - // VariantArm64Musl, + VariantArm64, + VariantArm64Musl, }, PluginSignature: PluginSignature{ Sign: false, @@ -28,10 +27,9 @@ var Versions = VersionMap{ }, MainMode: { Variants: []Variant{ - // https://github.com/golang/go/issues/58425 disabling arm builds until go issue is resolved - // VariantArmV6, - // VariantArmV7, - // VariantArmV7Musl, + VariantArmV6, + VariantArmV7, + VariantArmV7Musl, VariantArm64, VariantArm64Musl, VariantDarwinAmd64, @@ -48,8 +46,7 @@ var Versions = VersionMap{ Architectures: []Architecture{ ArchAMD64, ArchARM64, - // 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. + ArchARMv7, // GOARCH=ARM is used for both armv6 and armv7. They are differentiated by the GOARM variable. }, Distribution: []Distribution{ Alpine, @@ -65,10 +62,9 @@ var Versions = VersionMap{ }, DownstreamMode: { Variants: []Variant{ - // https://github.com/golang/go/issues/58425 disabling arm builds until go issue is resolved - // VariantArmV6, - //VariantArmV7, - // VariantArmV7Musl, + VariantArmV6, + VariantArmV7, + VariantArmV7Musl, VariantArm64, VariantArm64Musl, VariantDarwinAmd64, @@ -85,8 +81,7 @@ var Versions = VersionMap{ Architectures: []Architecture{ ArchAMD64, ArchARM64, - // 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. + ArchARMv7, // GOARCH=ARM is used for both armv6 and armv7. They are differentiated by the GOARM variable. }, Distribution: []Distribution{ Alpine, @@ -101,10 +96,9 @@ var Versions = VersionMap{ }, ReleaseBranchMode: { Variants: []Variant{ - // https://github.com/golang/go/issues/58425 disabling arm builds until go issue is resolved - // VariantArmV6, - // VariantArmV7, - // VariantArmV7Musl, + VariantArmV6, + VariantArmV7, + VariantArmV7Musl, VariantArm64, VariantArm64Musl, VariantDarwinAmd64, @@ -137,10 +131,9 @@ var Versions = VersionMap{ }, TagMode: { Variants: []Variant{ - // https://github.com/golang/go/issues/58425 disabling arm builds until go issue is resolved - // VariantArmV6, - // VariantArmV7, - // VariantArmV7Musl, + VariantArmV6, + VariantArmV7, + VariantArmV7Musl, VariantArm64, VariantArm64Musl, VariantDarwinAmd64, @@ -157,8 +150,7 @@ var Versions = VersionMap{ Architectures: []Architecture{ ArchAMD64, ArchARM64, - // https://github.com/golang/go/issues/58425 disabling arm builds until go issue is resolved - // ArchARMv7, + ArchARMv7, }, Distribution: []Distribution{ Alpine, @@ -177,10 +169,9 @@ var Versions = VersionMap{ }, Enterprise2Mode: { Variants: []Variant{ - // https://github.com/golang/go/issues/58425 disabling arm builds until go issue is resolved - // VariantArmV6, - // VariantArmV7, - // VariantArmV7Musl, + VariantArmV6, + VariantArmV7, + VariantArmV7Musl, VariantArm64, VariantArm64Musl, VariantDarwinAmd64, @@ -197,8 +188,7 @@ var Versions = VersionMap{ Architectures: []Architecture{ ArchAMD64, ArchARM64, - // https://github.com/golang/go/issues/58425 disabling arm builds until go issue is resolved - // ArchARMv7, + ArchARMv7, }, Distribution: []Distribution{ Alpine, diff --git a/scripts/drone/pipelines/build.star b/scripts/drone/pipelines/build.star index 454c684759a..e12319f1faf 100644 --- a/scripts/drone/pipelines/build.star +++ b/scripts/drone/pipelines/build.star @@ -70,7 +70,7 @@ def build_e2e(trigger, ver_mode): [ build_frontend_package_step(), enterprise_downstream_step(ver_mode = ver_mode), - rgm_artifacts_step(artifacts = ["targz:grafana:linux/amd64", "targz:grafana:linux/arm64"], file = "packages.txt"), + rgm_artifacts_step(artifacts = ["targz:grafana:linux/amd64", "targz:grafana:linux/arm64", "targz:grafana:linux/arm/v7"], file = "packages.txt"), ], ) else: @@ -81,6 +81,7 @@ def build_e2e(trigger, ver_mode): artifacts = [ "targz:grafana:linux/amd64", "targz:grafana:linux/arm64", + "targz:grafana:linux/arm/v7", ], depends_on = ["update-package-json-version"], file = "packages.txt", diff --git a/scripts/drone/variables.star b/scripts/drone/variables.star index fc5acca9198..2db2328f437 100644 --- a/scripts/drone/variables.star +++ b/scripts/drone/variables.star @@ -2,7 +2,7 @@ global variables """ -grabpl_version = "v3.0.42" +grabpl_version = "v3.0.46" golang_version = "1.21.5" # nodejs_version should match what's in ".nvmrc", but without the v prefix.