From c0a786860f055e6c95eba20907273e9d8bc1ae88 Mon Sep 17 00:00:00 2001 From: Victor Marin <36818606+mdvictor@users.noreply.github.com> Date: Fri, 15 Dec 2023 15:07:38 +0200 Subject: [PATCH] Re-add arm32 releases (#242) --- scripts/drone_build_main.sh | 5 +++++ scripts/drone_build_main_enterprise.sh | 4 ++++ scripts/drone_build_nightly_grafana.sh | 14 +++++++------- scripts/drone_build_tag_enterprise.sh | 4 ++++ scripts/drone_build_tag_grafana.sh | 6 ++++++ 5 files changed, 26 insertions(+), 7 deletions(-) diff --git a/scripts/drone_build_main.sh b/scripts/drone_build_main.sh index f0f3dc3b..e982f2c1 100755 --- a/scripts/drone_build_main.sh +++ b/scripts/drone_build_main.sh @@ -10,12 +10,17 @@ dagger run --silent go run ./cmd \ artifacts \ -a targz:grafana:linux/amd64 \ -a targz:grafana:linux/arm64 \ + -a targz:grafana:linux/arm/v6 \ + -a targz:grafana:linux/arm/v7 \ -a targz:grafana:windows/amd64 \ -a targz:grafana:darwin/amd64 \ -a deb:grafana:linux/amd64 \ -a deb:grafana:linux/arm64 \ + -a deb:grafana:linux/arm/v6 \ + -a deb:grafana:linux/arm/v7 \ -a docker:grafana:linux/amd64 \ -a docker:grafana:linux/arm64 \ + -a docker:grafana:linux/arm/v7 \ --yarn-cache=${YARN_CACHE_FOLDER} \ --checksum \ --verify \ diff --git a/scripts/drone_build_main_enterprise.sh b/scripts/drone_build_main_enterprise.sh index c81e4b8f..9bcea459 100755 --- a/scripts/drone_build_main_enterprise.sh +++ b/scripts/drone_build_main_enterprise.sh @@ -8,8 +8,12 @@ dagger run --silent go run ./cmd \ artifacts \ -a targz:enterprise:linux/amd64 \ -a targz:enterprise:linux/arm64 \ + -a targz:enterprise:linux/arm/v6 \ + -a targz:enterprise:linux/arm/v7 \ -a deb:enterprise:linux/amd64 \ -a deb:enterprise:linux/arm64 \ + -a deb:enterprise:linux/arm/v6 \ + -a deb:enterprise:linux/arm/v7 \ -a docker:enterprise:linux/amd64 \ -a docker:enterprise:linux/arm64 \ --yarn-cache=${YARN_CACHE_FOLDER} \ diff --git a/scripts/drone_build_nightly_grafana.sh b/scripts/drone_build_nightly_grafana.sh index 7828a570..6096cfab 100755 --- a/scripts/drone_build_nightly_grafana.sh +++ b/scripts/drone_build_nightly_grafana.sh @@ -4,19 +4,17 @@ local_dst="${DRONE_WORKSPACE}/dist" # This command enables qemu emulators for building Docker images for arm64/armv6/armv7/etc on the host. docker run --privileged --rm tonistiigi/binfmt --install all - # Temporarily removed: - # -a targz:grafana:linux/arm/v7 \ - # -a targz:grafana:linux/arm/v6 \ - # -a deb:grafana:linux/arm/v6:nightly \ - # -a deb:grafana:linux/arm/v7:nightly \ - # -a docker:grafana:linux/arm/v7 \ - # -a docker:grafana:linux/arm/v7:ubuntu \ + dagger run --silent go run ./cmd \ artifacts \ -a targz:grafana:linux/amd64 \ -a targz:grafana:linux/arm64 \ + -a targz:grafana:linux/arm/v7 \ + -a targz:grafana:linux/arm/v6 \ -a deb:grafana:linux/amd64:nightly \ -a deb:grafana:linux/arm64:nightly \ + -a deb:grafana:linux/arm/v6:nightly \ + -a deb:grafana:linux/arm/v7:nightly \ -a rpm:grafana:linux/amd64:sign:nightly \ -a rpm:grafana:linux/arm64:sign:nightly \ -a targz:grafana:windows/amd64 \ @@ -27,8 +25,10 @@ dagger run --silent go run ./cmd \ -a exe:grafana:windows/amd64 \ -a docker:grafana:linux/amd64 \ -a docker:grafana:linux/arm64 \ + -a docker:grafana:linux/arm/v7 \ -a docker:grafana:linux/amd64:ubuntu \ -a docker:grafana:linux/arm64:ubuntu \ + -a docker:grafana:linux/arm/v7:ubuntu \ --checksum \ --verify \ --build-id=${DRONE_BUILD_NUMBER} \ diff --git a/scripts/drone_build_tag_enterprise.sh b/scripts/drone_build_tag_enterprise.sh index 6bdb17e5..f4c546b1 100755 --- a/scripts/drone_build_tag_enterprise.sh +++ b/scripts/drone_build_tag_enterprise.sh @@ -10,8 +10,12 @@ dagger run --silent go run ./cmd \ artifacts \ -a targz:enterprise:linux/amd64 \ -a targz:enterprise:linux/arm64 \ + -a targz:enterprise:linux/arm/v6 \ + -a targz:enterprise:linux/arm/v7 \ -a deb:enterprise:linux/amd64 \ -a deb:enterprise:linux/arm64 \ + -a deb:enterprise:linux/arm/v6 \ + -a deb:enterprise:linux/arm/v7 \ -a rpm:enterprise:linux/amd64:sign \ -a rpm:enterprise:linux/arm64:sign \ -a targz:enterprise:windows/amd64 \ diff --git a/scripts/drone_build_tag_grafana.sh b/scripts/drone_build_tag_grafana.sh index 326b3c04..98b7b11a 100755 --- a/scripts/drone_build_tag_grafana.sh +++ b/scripts/drone_build_tag_grafana.sh @@ -12,14 +12,20 @@ dagger run --silent go run ./cmd \ -a storybook \ -a targz:grafana:linux/amd64 \ -a targz:grafana:linux/arm64 \ + -a targz:grafana:linux/arm/v6 \ + -a targz:grafana:linux/arm/v7 \ -a deb:grafana:linux/amd64 \ -a deb:grafana:linux/arm64 \ + -a deb:grafana:linux/arm/v6 \ + -a deb:grafana:linux/arm/v7 \ -a rpm:grafana:linux/amd64:sign \ -a rpm:grafana:linux/arm64:sign \ -a docker:grafana:linux/amd64 \ -a docker:grafana:linux/arm64 \ + -a docker:grafana:linux/arm/v7 \ -a docker:grafana:linux/amd64:ubuntu \ -a docker:grafana:linux/arm64:ubuntu \ + -a docker:grafana:linux/arm/v7:ubuntu \ -a targz:grafana:windows/amd64 \ -a targz:grafana:windows/arm64 \ -a targz:grafana:darwin/amd64 \