Merge remote-tracking branch 'origin' into nightly-enterprise

grafana · Oct 11, 2023 · 253123c · 253123c
2 parents 11c8a20 + a740af1
commit 253123c
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 12 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -0,0 +1,10 @@
+version: 2
+updates:
+  - package-ecosystem: "gomod"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"
diff --git a/containers/opts_grafana.go b/containers/opts_grafana.go
@@ -15,7 +15,7 @@ import (
 )
 
 const (
-	DefaultGoVersion = "1.20.8"
+	DefaultGoVersion = "1.20.10"
 )
 
 // GrafnaaOpts are populated by the 'GrafanaFlags' flags.

diff --git a/pipelines/package.go b/pipelines/package.go
@@ -88,6 +88,7 @@ func PackageFiles(ctx context.Context, d *dagger.Client, opts PackageOpts) (map[
 			".yarn":           src.Directory(".yarn").WithoutDirectory("/src/.yarn/cache"),
 			"packages":        src.Directory("packages"),
 			"plugins-bundled": src.Directory("plugins-bundled"),
+			"public":          src.Directory("public"),
 		},
 		Files: map[string]*dagger.File{
 			"package.json": src.File("package.json"),

diff --git a/pipelines/rpm.go b/pipelines/rpm.go
@@ -53,7 +53,6 @@ func RPM(ctx context.Context, d *dagger.Client, args PipelineArgs) error {
 			"/sbin/service",
 			"fontconfig",
 			"freetype",
-			"urw-fonts",
 		},
 		ExtraArgs: []string{
 			"--rpm-posttrans=/src/packaging/rpm/control/posttrans",

diff --git a/scripts/drone_publish_tag_pro.sh b/scripts/drone_publish_tag_pro.sh
@@ -12,8 +12,6 @@ dagger run --silent go run ./cmd \
   --yarn-cache=${YARN_CACHE_FOLDER} \
   --distro=linux/amd64 \
   --distro=linux/arm64 \
-  --distro=linux/arm/v6 \
-  --distro=linux/arm/v7 \
   --distro=darwin/amd64 \
   --distro=windows/amd64 \
   --env GO_BUILD_TAGS=pro \
@@ -42,14 +40,6 @@ dagger run --silent go run ./cmd deb \
   --destination=${local_dst} \
   --gcp-service-account-key-base64=${GCP_KEY_BASE64} > debs.txt
 
-# 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}') \
-  --name=grafana-pro-rpi \
-  --checksum \
-  --destination=${local_dst} \
-  --gcp-service-account-key-base64=${GCP_KEY_BASE64} >> debs.txt
-
 # Build a docker image for all .tar.gz packages
 dagger run --silent go run ./cmd docker \
   $(cat assets.txt | grep tar.gz | grep -v docker | grep -v sha256 | grep -v windows | grep -v darwin | grep -v arm-6 | awk '{print "--package=" $0}') \
-Original file line number
+Diff line change
@@ Expand Up / @@ -15,7 +15,7 @@ import ( @@
     )
     const (
-    	DefaultGoVersion = "1.20.8"
+    	DefaultGoVersion = "1.20.10"
     )
     // GrafnaaOpts are populated by the 'GrafanaFlags' flags.
@@ Expand Down @@