public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug: Exclude 32-bit arm builds (#75448)

Browse Source 
* Exclude 32 bit arm builds

* Bump grabpl - remove arm/v7 from build.star
This commit is contained in:
Dimitris Sotirakis
2023-10-11 09:47:06 +02:00
committed by Horst Gutmann
parent ddcd6dad88
commit f7685bafec
6 changed files with 75 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.drone.yml
+16 -16
View File
@@ -120,7 +120,7 @@ steps:
name: identify-runner name: identify-runner
- commands: - commands:
- mkdir -p bin - 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 - chmod +x bin/grabpl
image: byrnedo/alpine-curl:0.1.8 image: byrnedo/alpine-curl:0.1.8
name: grabpl name: grabpl
@@ -465,7 +465,7 @@ steps:
name: identify-runner name: identify-runner
- commands: - commands:
- mkdir -p bin - 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 - chmod +x bin/grabpl
image: byrnedo/alpine-curl:0.1.8 image: byrnedo/alpine-curl:0.1.8
name: grabpl name: grabpl
@@ -852,7 +852,7 @@ steps:
name: clone-enterprise name: clone-enterprise
- commands: - commands:
- mkdir -p bin - 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 - chmod +x bin/grabpl
image: byrnedo/alpine-curl:0.1.8 image: byrnedo/alpine-curl:0.1.8
name: grabpl name: grabpl
@@ -1149,7 +1149,7 @@ steps:
name: identify-runner name: identify-runner
- commands: - commands:
- mkdir -p bin - 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 - chmod +x bin/grabpl
image: byrnedo/alpine-curl:0.1.8 image: byrnedo/alpine-curl:0.1.8
name: grabpl name: grabpl
@@ -1399,7 +1399,7 @@ steps:
name: identify-runner name: identify-runner
- commands: - commands:
- mkdir -p bin - 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 - chmod +x bin/grabpl
image: byrnedo/alpine-curl:0.1.8 image: byrnedo/alpine-curl:0.1.8
name: grabpl name: grabpl
@@ -1842,7 +1842,7 @@ services:
steps: steps:
- commands: - commands:
- mkdir -p bin - 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 - chmod +x bin/grabpl
image: byrnedo/alpine-curl:0.1.8 image: byrnedo/alpine-curl:0.1.8
name: grabpl name: grabpl
@@ -1958,7 +1958,7 @@ steps:
name: identify-runner name: identify-runner
- commands: - commands:
- $$ProgressPreference = "SilentlyContinue" - $$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 -OutFile grabpl.exe
image: grafana/ci-wix:0.1.1 image: grafana/ci-wix:0.1.1
name: windows-init name: windows-init
@@ -2139,7 +2139,7 @@ steps:
name: identify-runner name: identify-runner
- commands: - commands:
- mkdir -p bin - 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 - chmod +x bin/grabpl
image: byrnedo/alpine-curl:0.1.8 image: byrnedo/alpine-curl:0.1.8
name: grabpl name: grabpl
@@ -2511,7 +2511,7 @@ steps:
name: identify-runner name: identify-runner
- commands: - commands:
- mkdir -p bin - 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 - chmod +x bin/grabpl
image: byrnedo/alpine-curl:0.1.8 image: byrnedo/alpine-curl:0.1.8
name: grabpl name: grabpl
@@ -2759,7 +2759,7 @@ steps:
name: identify-runner name: identify-runner
- commands: - commands:
- $$ProgressPreference = "SilentlyContinue" - $$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 -OutFile grabpl.exe
failure: ignore failure: ignore
image: grafana/ci-wix:0.1.1 image: grafana/ci-wix:0.1.1
@@ -2923,7 +2923,7 @@ steps:
name: identify-runner name: identify-runner
- commands: - commands:
- mkdir -p bin - 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 - chmod +x bin/grabpl
image: byrnedo/alpine-curl:0.1.8 image: byrnedo/alpine-curl:0.1.8
name: grabpl name: grabpl
@@ -3202,7 +3202,7 @@ steps:
name: identify-runner name: identify-runner
- commands: - commands:
- mkdir -p bin - 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 - chmod +x bin/grabpl
image: byrnedo/alpine-curl:0.1.8 image: byrnedo/alpine-curl:0.1.8
name: grabpl name: grabpl
@@ -3343,7 +3343,7 @@ services:
steps: steps:
- commands: - commands:
- mkdir -p bin - 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 - chmod +x bin/grabpl
image: byrnedo/alpine-curl:0.1.8 image: byrnedo/alpine-curl:0.1.8
name: grabpl name: grabpl
@@ -3444,7 +3444,7 @@ steps:
name: identify-runner name: identify-runner
- commands: - commands:
- $$ProgressPreference = "SilentlyContinue" - $$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 -OutFile grabpl.exe
image: grafana/ci-wix:0.1.1 image: grafana/ci-wix:0.1.1
name: windows-init name: windows-init
@@ -3514,7 +3514,7 @@ services:
steps: steps:
- commands: - commands:
- mkdir -p bin - 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 - chmod +x bin/grabpl
image: byrnedo/alpine-curl:0.1.8 image: byrnedo/alpine-curl:0.1.8
name: grabpl name: grabpl
@@ -4240,6 +4240,6 @@ kind: secret
name: gcr_credentials name: gcr_credentials
--- ---
kind: signature kind: signature
hmac: a0be61b00bbe2cd94b11a1922b413b394f5f79cf2d2fafa0e1ee1b13c40ad3d0 hmac: ab65485c31598f6d4b184cbd50dcbbc409cf1666caaa4db46067881b95de9dfa
... ...
pkg/build/config/variant.go
+3 -3
View File
@@ -16,9 +16,9 @@ const (
) )
var AllVariants = []Variant{ var AllVariants = []Variant{
VariantArmV6, // VariantArmV6,
VariantArmV7, // VariantArmV7,
VariantArmV7Musl, // VariantArmV7Musl,
VariantArm64, VariantArm64,
VariantArm64Musl, VariantArm64Musl,
VariantDarwinAmd64, VariantDarwinAmd64,
pkg/build/config/versions.go
+28 -24
View File
@@ -1,7 +1,5 @@
package config package config
const PublicBucket = "grafana-downloads"
var Versions = VersionMap{ var Versions = VersionMap{
PullRequestMode: { PullRequestMode: {
Variants: []Variant{ Variants: []Variant{
@@ -9,8 +7,9 @@ var Versions = VersionMap{
VariantLinuxAmd64Musl, VariantLinuxAmd64Musl,
VariantDarwinAmd64, VariantDarwinAmd64,
VariantWindowsAmd64, VariantWindowsAmd64,
VariantArm64, // https://github.com/golang/go/issues/58425 disabling arm builds until go issue is resolved
VariantArm64Musl, // VariantArm64,
// VariantArm64Musl,
}, },
PluginSignature: PluginSignature{ PluginSignature: PluginSignature{
Sign: false, Sign: false,
@@ -29,9 +28,10 @@ var Versions = VersionMap{
}, },
MainMode: { MainMode: {
Variants: []Variant{ Variants: []Variant{
VariantArmV6, // https://github.com/golang/go/issues/58425 disabling arm builds until go issue is resolved
VariantArmV7, // VariantArmV6,
VariantArmV7Musl, // VariantArmV7,
// VariantArmV7Musl,
VariantArm64, VariantArm64,
VariantArm64Musl, VariantArm64Musl,
VariantDarwinAmd64, VariantDarwinAmd64,
@@ -48,7 +48,8 @@ var Versions = VersionMap{
Architectures: []Architecture{ Architectures: []Architecture{
ArchAMD64, ArchAMD64,
ArchARM64, 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{ Distribution: []Distribution{
Alpine, Alpine,
@@ -64,9 +65,10 @@ var Versions = VersionMap{
}, },
DownstreamMode: { DownstreamMode: {
Variants: []Variant{ Variants: []Variant{
VariantArmV6, // https://github.com/golang/go/issues/58425 disabling arm builds until go issue is resolved
VariantArmV7, // VariantArmV6,
VariantArmV7Musl, //VariantArmV7,
// VariantArmV7Musl,
VariantArm64, VariantArm64,
VariantArm64Musl, VariantArm64Musl,
VariantDarwinAmd64, VariantDarwinAmd64,
@@ -83,7 +85,7 @@ var Versions = VersionMap{
Architectures: []Architecture{ Architectures: []Architecture{
ArchAMD64, ArchAMD64,
ArchARM64, 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{ Distribution: []Distribution{
Alpine, Alpine,
@@ -98,9 +100,9 @@ var Versions = VersionMap{
}, },
ReleaseBranchMode: { ReleaseBranchMode: {
Variants: []Variant{ Variants: []Variant{
VariantArmV6, // VariantArmV6,
VariantArmV7, // VariantArmV7,
VariantArmV7Musl, // VariantArmV7Musl,
VariantArm64, VariantArm64,
VariantArm64Musl, VariantArm64Musl,
VariantDarwinAmd64, VariantDarwinAmd64,
@@ -117,7 +119,7 @@ var Versions = VersionMap{
Architectures: []Architecture{ Architectures: []Architecture{
ArchAMD64, ArchAMD64,
ArchARM64, ArchARM64,
ArchARMv7, // ArchARMv7,
}, },
Distribution: []Distribution{ Distribution: []Distribution{
Alpine, Alpine,
@@ -133,9 +135,9 @@ var Versions = VersionMap{
}, },
TagMode: { TagMode: {
Variants: []Variant{ Variants: []Variant{
VariantArmV6, // VariantArmV6,
VariantArmV7, // VariantArmV7,
VariantArmV7Musl, // VariantArmV7Musl,
VariantArm64, VariantArm64,
VariantArm64Musl, VariantArm64Musl,
VariantDarwinAmd64, VariantDarwinAmd64,
@@ -152,7 +154,7 @@ var Versions = VersionMap{
Architectures: []Architecture{ Architectures: []Architecture{
ArchAMD64, ArchAMD64,
ArchARM64, ArchARM64,
ArchARMv7, // ArchARMv7,
}, },
Distribution: []Distribution{ Distribution: []Distribution{
Alpine, Alpine,
@@ -171,9 +173,10 @@ var Versions = VersionMap{
}, },
Enterprise2Mode: { Enterprise2Mode: {
Variants: []Variant{ Variants: []Variant{
VariantArmV6, // https://github.com/golang/go/issues/58425 disabling arm builds until go issue is resolved
VariantArmV7, // VariantArmV6,
VariantArmV7Musl, // VariantArmV7,
// VariantArmV7Musl,
VariantArm64, VariantArm64,
VariantArm64Musl, VariantArm64Musl,
VariantDarwinAmd64, VariantDarwinAmd64,
@@ -190,7 +193,8 @@ var Versions = VersionMap{
Architectures: []Architecture{ Architectures: []Architecture{
ArchAMD64, ArchAMD64,
ArchARM64, ArchARM64,
ArchARMv7, // https://github.com/golang/go/issues/58425 disabling arm builds until go issue is resolved
// ArchARMv7,
}, },
Distribution: []Distribution{ Distribution: []Distribution{
Alpine, Alpine,
pkg/build/docker/init.go
+1 -1
View File
@@ -8,7 +8,7 @@ import (
) )
// AllArchs is a list of all supported Docker image architectures. // 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 // emulatorImage is the docker image used as the cross-platform emulator
var emulatorImage = "tonistiigi/binfmt:qemu-v7.0.0" var emulatorImage = "tonistiigi/binfmt:qemu-v7.0.0"
pkg/build/packaging/artifacts.go
+26 -26
View File
@@ -81,32 +81,32 @@ var ArtifactConfigs = []buildArtifact{
Arch: "arm64", Arch: "arm64",
urlPostfix: ".linux-arm64.tar.gz", urlPostfix: ".linux-arm64.tar.gz",
}, },
{ // {
Os: debOS, // Os: debOS,
Arch: "armv7", // Arch: "armv7",
urlPostfix: "_armhf.deb", // urlPostfix: "_armhf.deb",
}, // },
{ // {
Os: debOS, // Os: debOS,
Arch: "armv6", // Arch: "armv6",
packagePostfix: "-rpi", // packagePostfix: "-rpi",
urlPostfix: "_armhf.deb", // urlPostfix: "_armhf.deb",
}, // },
{ // {
Os: rhelOS, // Os: rhelOS,
Arch: "armv7", // Arch: "armv7",
urlPostfix: ".armhfp.rpm", // urlPostfix: ".armhfp.rpm",
}, // },
{ // {
Os: "linux", // Os: "linux",
Arch: "armv6", // Arch: "armv6",
urlPostfix: ".linux-armv6.tar.gz", // urlPostfix: ".linux-armv6.tar.gz",
}, // },
{ // {
Os: "linux", // Os: "linux",
Arch: "armv7", // Arch: "armv7",
urlPostfix: ".linux-armv7.tar.gz", // urlPostfix: ".linux-armv7.tar.gz",
}, // },
{ {
Os: "darwin", Os: "darwin",
Arch: "amd64", Arch: "amd64",
scripts/drone/steps/lib.star
+1 -1
View File
@@ -20,7 +20,7 @@ load(
"windows_images", "windows_images",
) )
grabpl_version = "v3.0.41" grabpl_version = "v3.0.42"
trigger_oss = { trigger_oss = {
"repo": [ "repo": [