From f25c9b0e0364df5aa8d9a20a035fbe71771e8565 Mon Sep 17 00:00:00 2001 From: Ryan McKinley Date: Tue, 8 Jul 2025 06:29:45 -0700 Subject: [PATCH] merge main --- go.mod | 2 ++ go.sum | 2 ++ 2 files changed, 4 insertions(+) diff --git a/go.mod b/go.mod index 44aa93b4190..1916d40b5e6 100644 --- a/go.mod +++ b/go.mod @@ -246,6 +246,8 @@ require ( github.com/grafana/grafana/pkg/semconv v0.0.0-20250627191313-2f1a6ae1712b // @grafana/grafana-app-platform-squad ) +require github.com/grafana/grafana/pkg/build v0.0.0-20250707180844-1244f5c53d23 + require ( cel.dev/expr v0.23.1 // indirect cloud.google.com/go v0.120.0 // indirect diff --git a/go.sum b/go.sum index 88a184a171a..956cc1041f2 100644 --- a/go.sum +++ b/go.sum @@ -1644,6 +1644,8 @@ github.com/grafana/grafana/pkg/apis/secret v0.0.0-20250627191313-2f1a6ae1712b h1 github.com/grafana/grafana/pkg/apis/secret v0.0.0-20250627191313-2f1a6ae1712b/go.mod h1:9YjiHZzii2DZfocRDJbqSeC8M3GWenU5yexeHHxsZ4Y= github.com/grafana/grafana/pkg/apiserver v0.0.0-20250627191313-2f1a6ae1712b h1:QyJLJn3xwFTIXu9KPZujsrIUN0X8DdiR9b2h75L0AfI= github.com/grafana/grafana/pkg/apiserver v0.0.0-20250627191313-2f1a6ae1712b/go.mod h1:6OKkPWDB8PetDXqMVMOWL35iTCEUdpATwwpuew0k8+o= +github.com/grafana/grafana/pkg/build v0.0.0-20250707180844-1244f5c53d23 h1:GjEWUG7S9j7bYj0wgD5J7o2LKeML58KT1nTyR+pOJn4= +github.com/grafana/grafana/pkg/build v0.0.0-20250707180844-1244f5c53d23/go.mod h1:uU3TK/cKf6IdO7ou7CKgNNb8GEnW761Ecdb8tk8DQLg= github.com/grafana/grafana/pkg/promlib v0.0.8 h1:VUWsqttdf0wMI4j9OX9oNrykguQpZcruudDAFpJJVw0= github.com/grafana/grafana/pkg/promlib v0.0.8/go.mod h1:U1ezG/MGaEPoThqsr3lymMPN5yIPdVTJnDZ+wcXT+ao= github.com/grafana/grafana/pkg/semconv v0.0.0-20250627191313-2f1a6ae1712b h1:m78RNSvTseSpvwQYe5HcdsiADSw4vj6+QUppuCL63gw=