Merge branch 'master' into patch-1

grafana · Dec 10, 2024 · 40a57b9 · 40a57b9
2 parents 5718217 + 0481187
commit 40a57b9
Show file tree

Hide file tree

Showing 20 changed files with 586 additions and 440 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -18,7 +18,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
         with:
-          go-version: 1.18
+          go-version: 1.23
       - name: Install CI dependencies
         run: make install-ci-deps
       - name: Lint and Format
@@ -33,7 +33,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
         with:
-          go-version: 1.18
+          go-version: 1.23
       - name: Install CI dependencies
         run: make install-ci-deps
       - name: Run Tests

diff --git a/.github/workflows/lint-mixins.yml b/.github/workflows/lint-mixins.yml
@@ -25,7 +25,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v5
         with:
-          go-version: 1.18
+          go-version: 1.23
 
       - name: Install CI dependencies
         run: make install-ci-deps
@@ -68,7 +68,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v5
         with:
-          go-version: 1.18
+          go-version: 1.23
 
       - name: Install CI dependencies
         run: make install-ci-deps

diff --git a/Makefile b/Makefile
@@ -5,7 +5,7 @@ install-ci-deps:
 	go install github.com/google/go-jsonnet/cmd/[email protected]
 	go install github.com/google/go-jsonnet/cmd/[email protected]
 	go install github.com/google/go-jsonnet/cmd/[email protected]
-	go install github.com/monitoring-mixins/mixtool/cmd/mixtool@a9e78b0942a4186162bf170efde7b4b3167d31a4
+	go install github.com/monitoring-mixins/mixtool/cmd/mixtool@a8984473edc33da685bd5f2138eab9cf6a0ff2b7
 	go install github.com/jsonnet-bundler/jsonnet-bundler/cmd/[email protected]
 
 fmt: