IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
* Exclude 32 bit arm builds

# Conflicts:
#	pkg/build/config/versions.go

* Bump grabpl - remove arm/v7 from build.star

# Conflicts:
#	.drone.yml
This commit is contained in:
Dimitris Sotirakis
2023-09-29 20:33:01 +03:00
committed by GitHub
parent c72c4382ba
commit c08606d2c5
3 changed files with 21 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
.drone.yml
View File

@@ -587,7 +587,7 @@ steps:
token: token:
from_secret: drone_token from_secret: drone_token
- commands: - commands:
- /src/grafana-build package --distro=linux/amd64,linux/arm64,linux/arm/v7 --go-version=1.20.8 - /src/grafana-build package --distro=linux/amd64,linux/arm64 --go-version=1.20.8
--yarn-cache=$$YARN_CACHE_FOLDER --build-id=$$DRONE_BUILD_NUMBER --grafana-dir=$$PWD --yarn-cache=$$YARN_CACHE_FOLDER --build-id=$$DRONE_BUILD_NUMBER --grafana-dir=$$PWD
> packages.txt > packages.txt
depends_on: depends_on:
@@ -1744,7 +1744,7 @@ steps:
image: node:18.12.0-alpine image: node:18.12.0-alpine
name: build-frontend-packages name: build-frontend-packages
- commands: - commands:
- /src/grafana-build package --distro=linux/amd64,linux/arm64,linux/arm/v7 --go-version=1.20.8 - /src/grafana-build package --distro=linux/amd64,linux/arm64 --go-version=1.20.8
--yarn-cache=$$YARN_CACHE_FOLDER --build-id=$$DRONE_BUILD_NUMBER --grafana-dir=$$PWD --yarn-cache=$$YARN_CACHE_FOLDER --build-id=$$DRONE_BUILD_NUMBER --grafana-dir=$$PWD
> packages.txt > packages.txt
depends_on: depends_on:
@@ -4212,6 +4212,6 @@ kind: secret
name: gcr_credentials name: gcr_credentials
--- ---
kind: signature kind: signature
hmac: 84da089797850e74589428fafc6485435b968df9183a7ee7203ae2cd03f420c1 hmac: c14ca5e053041018df6b66df642accd7e7eee7e2b43ba8c8f7dee6c446a41bb0
... ...

27
pkg/build/config/versions.go
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,
@@ -173,9 +174,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,
@@ -192,7 +194,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,

2
scripts/drone/pipelines/build.star
View File

@@ -82,7 +82,7 @@ def build_e2e(trigger, ver_mode):
build_steps.extend( build_steps.extend(
[ [
rgm_package_step(distros = "linux/amd64,linux/arm64,linux/arm/v7", file = "packages.txt"), rgm_package_step(distros = "linux/amd64,linux/arm64", file = "packages.txt"),
grafana_server_step(), grafana_server_step(),
e2e_tests_step("dashboards-suite"), e2e_tests_step("dashboards-suite"),
e2e_tests_step("smoke-tests-suite"), e2e_tests_step("smoke-tests-suite"),