Use armv6 for -rpi instead of armv7

grafana · Sep 1, 2023 · 5aeacd8 · 5aeacd8
1 parent 0e8ddfd
commit 5aeacd8
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 6 deletions.
diff --git a/scripts/drone_publish_tag_enterprise.sh b/scripts/drone_publish_tag_enterprise.sh
@@ -39,7 +39,7 @@ dagger run --silent go run ./cmd deb \
 
 # Use the armv7 package to build the `rpi` specific version.
 dagger run --silent go run ./cmd deb \
-  $(cat assets.txt | grep tar.gz | grep -v docker | grep -v sha256 | grep -v windows | grep -v darwin | grep arm-7 | awk '{print "--package=" $0}') \
+  $(cat assets.txt | grep tar.gz | grep -v docker | grep -v sha256 | grep -v windows | grep -v darwin | grep arm-6 | awk '{print "--package=" $0}') \
   --name=grafana-enterprise-rpi \
   --checksum \
   --destination=${local_dst} \

diff --git a/scripts/drone_publish_tag_grafana.sh b/scripts/drone_publish_tag_grafana.sh
@@ -49,7 +49,7 @@ dagger run --silent go run ./cmd deb \
 
 # Use the armv7 package to build the `rpi` specific version.
 dagger run --silent go run ./cmd deb \
-  $(cat assets.txt | grep tar.gz | grep -v docker | grep -v sha256 | grep -v windows | grep -v darwin | grep arm-7 | awk '{print "--package=" $0}') \
+  $(cat assets.txt | grep tar.gz | grep -v docker | grep -v sha256 | grep -v windows | grep -v darwin | grep arm-6 | awk '{print "--package=" $0}') \
   --name=grafana-rpi \
   --checksum \
   --destination=${local_dst} \

diff --git a/scripts/move_packages.go b/scripts/move_packages.go
@@ -211,11 +211,8 @@ func DebHandler(name string) []string {
 
 	names := []string{fullName}
 	goos, arch := executil.OSAndArch(opts.Distro)
-	arm := executil.ArchVersion(opts.Distro)
 	if arch == "arm" {
-		if arm == "7" {
-			arch = "armhf"
-		}
+		arch = "armhf"
 		// If we're building for arm then we also copy the same thing, but with the name '-rpi'. for osme reason?
 		names = []string{fullName}
 	}

diff --git a/scripts/move_packages_deb_test.go b/scripts/move_packages_deb_test.go
@@ -36,6 +36,12 @@ var debMapping = []m{
 			"artifacts/downloads/v1.2.3/oss/release/grafana-rpi_1.2.3_armhf.deb",
 		},
 	},
+	{
+		input: "gs://bucket/tag/grafana-rpi_v1.2.3_102_linux_arm-6.deb",
+		output: []string{
+			"artifacts/downloads/v1.2.3/oss/release/grafana-rpi_1.2.3_armhf.deb",
+		},
+	},
 	{
 		input: "gs://bucket/tag/grafana_v1.2.3_102_linux_arm-7.deb.sha256",
 		output: []string{