From 26e370ac6425bf91db021fe7b5a6b767a09014e1 Mon Sep 17 00:00:00 2001 From: jev forsberg Date: Mon, 4 Aug 2025 15:33:14 -0600 Subject: [PATCH] Fix: Clean up go.mod after removing enterprise files from OSS - Remove problematic pkg/build import that was causing CI failures - Update dependencies via workspace sync after enterprise cleanup - Resolves 'Changes detected' CI error and integration test import failures - OSS repository now matches clean 11.5.8 baseline state --- go.mod | 4 +--- go.sum | 4 ---- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/go.mod b/go.mod index 23cd4a91e96..829a992341f 100644 --- a/go.mod +++ b/go.mod @@ -466,8 +466,6 @@ require github.com/jmespath-community/go-jmespath v1.1.1 // @grafana/identity-ac require github.com/urfave/cli/v3 v3.3.8 // @grafana/grafana-backend-group -require github.com/grafana/grafana/pkg/build v0.0.0-20250804190500-279adadb1572 // @grafana/grafana-backend-group - require ( cel.dev/expr v0.24.0 // indirect cloud.google.com/go/longrunning v0.6.7 // indirect @@ -479,6 +477,7 @@ require ( github.com/at-wat/mqtt-go v0.19.4 // indirect github.com/cenkalti/backoff/v5 v5.0.2 // indirect github.com/cncf/xds/go v0.0.0-20250501225837-2ac532fd4443 // indirect + github.com/distribution/reference v0.6.0 // indirect github.com/dolthub/maphash v0.1.0 // indirect github.com/dprotaso/go-yit v0.0.0-20220510233725-9ba8df137936 // indirect github.com/emirpasic/gods v1.18.1 // indirect @@ -486,7 +485,6 @@ require ( github.com/gammazero/deque v0.2.1 // indirect github.com/go-jose/go-jose/v4 v4.1.0 // indirect github.com/go-viper/mapstructure/v2 v2.3.0 // indirect - github.com/google/go-github/v70 v70.0.0 // indirect github.com/grafana/grafana-app-sdk v0.19.0 // indirect github.com/grafana/grafana/pkg/semconv v0.0.0-20240808213237-f4d2e064f435 // indirect github.com/grafana/sqlds/v4 v4.1.0 // indirect diff --git a/go.sum b/go.sum index 0a829a54654..3239f43ac0c 100644 --- a/go.sum +++ b/go.sum @@ -2144,8 +2144,6 @@ github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeN github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8= github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU= github.com/google/go-github v17.0.0+incompatible/go.mod h1:zLgOLi98H3fifZn+44m+umXrS52loVEgC2AApnigrVQ= -github.com/google/go-github/v70 v70.0.0 h1:/tqCp5KPrcvqCc7vIvYyFYTiCGrYvaWoYMGHSQbo55o= -github.com/google/go-github/v70 v70.0.0/go.mod h1:xBUZgo8MI3lUL/hwxl3hlceJW1U8MVnXP3zUyI+rhQY= github.com/google/go-pkcs11 v0.2.0/go.mod h1:6eQoGcuNJpa7jnd5pMGdkSaQpNDYvPlXWMcjXXThLlY= github.com/google/go-pkcs11 v0.2.1-0.20230907215043-c6f79328ddf9/go.mod h1:6eQoGcuNJpa7jnd5pMGdkSaQpNDYvPlXWMcjXXThLlY= github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck= @@ -2298,8 +2296,6 @@ github.com/grafana/grafana/pkg/apimachinery v0.0.0-20240821155123-6891eb1d35da h github.com/grafana/grafana/pkg/apimachinery v0.0.0-20240821155123-6891eb1d35da/go.mod h1:p09fvU5ujNL/Ig8HB7g4f+S0zyYbQq3x/f0jA4ujVOM= github.com/grafana/grafana/pkg/apiserver v0.0.0-20240821155123-6891eb1d35da h1:xQMb8cRZYu7D0IO9q/lB7qFQpLGAoPUnCase1CGHrXY= github.com/grafana/grafana/pkg/apiserver v0.0.0-20240821155123-6891eb1d35da/go.mod h1:8kZIdcgyLiHBwXbZFFzg9XxM9zD8Ie3wkDhxWuqa5Oo= -github.com/grafana/grafana/pkg/build v0.0.0-20250804190500-279adadb1572 h1:YZ4jdUZEiE8tF9QoD5C3SpsfVzZLvbAnLO+T9xNSQig= -github.com/grafana/grafana/pkg/build v0.0.0-20250804190500-279adadb1572/go.mod h1:ogzzNsIjP2sWPNixRL7VQiH0Y/TFlOTo8zQt/25EHK8= github.com/grafana/grafana/pkg/promlib v0.0.6 h1:FuRyHMIgVVXkLuJnCflNfk3gqJflmyiI+/ZuJ9MoAfY= github.com/grafana/grafana/pkg/promlib v0.0.6/go.mod h1:shFkrG1fQ/PPNRGhxAPNMLp0SAeG/jhqaLoG6n2191M= github.com/grafana/grafana/pkg/semconv v0.0.0-20240808213237-f4d2e064f435 h1:SNEeqY22DrGr5E9kGF1mKSqlOom14W9+b1u4XEGJowA=