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

# Conflicts:
#	.drone.yml
#	pkg/build/config/versions.go
#	scripts/drone/steps/lib.star
This commit is contained in:
Andreas Christou
2023-11-14 16:21:09 +00:00
parent d250d5bc90
commit 2d97d24e41
4 changed files with 38 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
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
+8 -8
View File
@@ -101,9 +101,9 @@ var Versions = VersionMap{
}, },
ReleaseBranchMode: { ReleaseBranchMode: {
Variants: []Variant{ Variants: []Variant{
VariantArmV6, // VariantArmV6,
VariantArmV7, // VariantArmV7,
VariantArmV7Musl, // VariantArmV7Musl,
VariantArm64, VariantArm64,
VariantArm64Musl, VariantArm64Musl,
VariantDarwinAmd64, VariantDarwinAmd64,
@@ -120,7 +120,7 @@ var Versions = VersionMap{
Architectures: []Architecture{ Architectures: []Architecture{
ArchAMD64, ArchAMD64,
ArchARM64, ArchARM64,
ArchARMv7, // ArchARMv7,
}, },
Distribution: []Distribution{ Distribution: []Distribution{
Alpine, Alpine,
@@ -136,9 +136,9 @@ var Versions = VersionMap{
}, },
TagMode: { TagMode: {
Variants: []Variant{ Variants: []Variant{
VariantArmV6, // VariantArmV6,
VariantArmV7, // VariantArmV7,
VariantArmV7Musl, // VariantArmV7Musl,
VariantArm64, VariantArm64,
VariantArm64Musl, VariantArm64Musl,
VariantDarwinAmd64, VariantDarwinAmd64,
@@ -155,7 +155,7 @@ var Versions = VersionMap{
Architectures: []Architecture{ Architectures: []Architecture{
ArchAMD64, ArchAMD64,
ArchARM64, ArchARM64,
ArchARMv7, // 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",