Fix rpi builds of .deb packages and arm copies

pipelines/package_build.go

@@ -35,19 +35,18 @@ func BuildPackage(ctx context.Context, d *dagger.Client, src *dagger.Directory,
 		)
 		if isEnterprise {
 			edition = "enterprise"
-			// If the user has manually set the edition flag, then override it with their selection.
-			// Temporary fix: to avoid creating a --grafana and a --enterprise package with a conflicting name, only allow
-			// overriding the 'edition' if we're building enterprise.
-			if e := args.PackageOpts.Edition; e != "" {
-				edition = e
-			}
 			s, err := args.GrafanaOpts.Enterprise(ctx, src, d)
 			if err != nil {
 				return err
 			}
 			src = s
 		}
 
+		// If the user has manually set the edition flag, then override it with their selection.
+		if e := args.PackageOpts.Edition; e != "" {
+			edition = e
+		}
+
 		opts := PackageOpts{
 			GrafanaCompileOpts: &GrafanaCompileOpts{
 				Source:           src,

pipelines/package_installer.go

@@ -85,17 +85,20 @@ func PackageInstaller(ctx context.Context, d *dagger.Client, args PipelineArgs,
 			fpmArgs = append(fpmArgs, fmt.Sprintf("--architecture=%s", arch))
 		}
 
-		// Honestly we don't care about making fpm installers for non-enterprise or non-grafana flavors of grafana
 		if tarOpts.Edition == "enterprise" {
-			fpmArgs = append(fpmArgs, fmt.Sprintf("--name=grafana-%s", tarOpts.Edition))
 			fpmArgs = append(fpmArgs, "--description=\"Grafana Enterprise\"")
 			fpmArgs = append(fpmArgs, "--conflicts=grafana")
 		} else {
-			fpmArgs = append(fpmArgs, "--name=grafana")
 			fpmArgs = append(fpmArgs, "--description=Grafana")
 			fpmArgs = append(fpmArgs, "--license=agpl3")
 		}
 
+		if tarOpts.Edition != "" {
+			fpmArgs = append(fpmArgs, fmt.Sprintf("--name=grafana-%s", tarOpts.Edition))
+		} else {
+			fpmArgs = append(fpmArgs, "--name=grafana")
+		}
+
 		// The last fpm arg which is required to say, "use the PWD to build the package".
 		fpmArgs = append(fpmArgs, ".")
 

scripts/drone_publish_tag_grafana.sh

@@ -25,6 +25,19 @@ dagger run --silent go run ./cmd \
   --destination=${local_dst} \
   --gcp-service-account-key-base64=${GCP_KEY_BASE64} > assets.txt
 
+dagger run --silent go run ./cmd \
+  package \
+  --yarn-cache=${YARN_CACHE_FOLDER} \
+  --distro=linux/arm/v7 \
+  --checksum \
+  --build-id=${DRONE_BUILD_NUMBER} \
+  --grafana-dir=${GRAFANA_DIR} \
+  --github-token=${GITHUB_TOKEN} \
+  --version=${DRONE_TAG} \
+  --edition=rpi \
+  --destination=${local_dst} \
+  --gcp-service-account-key-base64=${GCP_KEY_BASE64} >> assets.txt
+
 echo "Done building tar.gz packages..."
 cat assets.txt
 

scripts/drone_publish_tag_pro.sh

@@ -11,6 +11,7 @@ dagger run go run ./cmd \
   package \
   --yarn-cache=${YARN_CACHE_FOLDER} \
   --distro=linux/amd64 \
+  --distro=linux/arm64 \
   --env GO_BUILD_TAGS=pro \
   --env WIRE_TAGS=pro \
   --go-tags=pro \