Skip to content

Commit 40a57b9

Browse files
authored
Merge branch 'master' into patch-1
2 parents 5718217 + 0481187 commit 40a57b9

File tree

20 files changed

+586
-440
lines changed

20 files changed

+586
-440
lines changed

.github/workflows/build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
- name: Setup Go
1919
uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
2020
with:
21-
go-version: 1.18
21+
go-version: 1.23
2222
- name: Install CI dependencies
2323
run: make install-ci-deps
2424
- name: Lint and Format
@@ -33,7 +33,7 @@ jobs:
3333
- name: Setup Go
3434
uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
3535
with:
36-
go-version: 1.18
36+
go-version: 1.23
3737
- name: Install CI dependencies
3838
run: make install-ci-deps
3939
- name: Run Tests

.github/workflows/lint-mixins.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
- name: Setup Go
2626
uses: actions/setup-go@v5
2727
with:
28-
go-version: 1.18
28+
go-version: 1.23
2929

3030
- name: Install CI dependencies
3131
run: make install-ci-deps
@@ -68,7 +68,7 @@ jobs:
6868
- name: Setup Go
6969
uses: actions/setup-go@v5
7070
with:
71-
go-version: 1.18
71+
go-version: 1.23
7272

7373
- name: Install CI dependencies
7474
run: make install-ci-deps

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ install-ci-deps:
55
go install github.com/google/go-jsonnet/cmd/[email protected]
66
go install github.com/google/go-jsonnet/cmd/[email protected]
77
go install github.com/google/go-jsonnet/cmd/[email protected]
8-
go install github.com/monitoring-mixins/mixtool/cmd/mixtool@a9e78b0942a4186162bf170efde7b4b3167d31a4
8+
go install github.com/monitoring-mixins/mixtool/cmd/mixtool@a8984473edc33da685bd5f2138eab9cf6a0ff2b7
99
go install github.com/jsonnet-bundler/jsonnet-bundler/cmd/[email protected]
1010

1111
fmt:

0 commit comments

Comments
 (0)