From e311b0f7a9f08ab0a63c62b7438816bce2078d7a Mon Sep 17 00:00:00 2001 From: Victor Marin <36818606+mdvictor@users.noreply.github.com> Date: Mon, 18 Dec 2023 10:56:41 +0200 Subject: [PATCH] [v10.1.x] Re-add arm32 builds (#79620) 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 | 35 ++++++++++++------------------ scripts/drone/pipelines/build.star | 3 ++- scripts/drone/variables.star | 2 +- 4 files changed, 30 insertions(+), 36 deletions(-) diff --git a/.drone.yml b/.drone.yml index a6c6cf4cb1f..fd746850e73 100644 --- a/.drone.yml +++ b/.drone.yml @@ -485,7 +485,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 @@ -553,8 +553,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 @@ -829,7 +829,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 @@ -1673,7 +1673,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 @@ -1740,8 +1740,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 @@ -2114,7 +2114,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 @@ -2316,7 +2316,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 @@ -2444,7 +2444,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 @@ -3093,7 +3093,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 @@ -3784,7 +3784,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 @@ -4561,6 +4561,6 @@ kind: secret name: gcr_credentials --- kind: signature -hmac: 15d9146134c0578749e527e5bffe407149757b0799dd671e098b49f7e16e01d0 +hmac: cd52349abca36571d5600467a1dce72ff1f0da65b8801b63d2ce3c9c5ed3d328 ... diff --git a/pkg/build/config/versions.go b/pkg/build/config/versions.go index 8decc72593c..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, @@ -174,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, @@ -194,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.