Skip to content

Commit fbb0033

Browse files
authored
Merge branch 'main' into operator32
2 parents cb1ff0f + 5a270c9 commit fbb0033

File tree

6 files changed

+25
-7
lines changed

6 files changed

+25
-7
lines changed

.github/workflows/changelog.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
- name: Setup Go
3434
uses: actions/setup-go@v5
3535
with:
36-
go-version: "~1.22.4"
36+
go-version: "~1.23.4"
3737

3838
- name: Ensure no changes to the CHANGELOG
3939
run: |

.github/workflows/continuous-integration.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
uses: actions/setup-go@v5
2323
id: setup-go
2424
with:
25-
go-version: "~1.22.4"
25+
go-version: "~1.23.4"
2626

2727
- name: Cache tools
2828
uses: actions/cache@v4
@@ -46,7 +46,7 @@ jobs:
4646
- name: Set up Go
4747
uses: actions/setup-go@v5
4848
with:
49-
go-version: "~1.22.4"
49+
go-version: "~1.23.4"
5050

5151
- name: Cache tools
5252
uses: actions/cache@v4
@@ -79,7 +79,7 @@ jobs:
7979
- name: Set up Go
8080
uses: actions/setup-go@v5
8181
with:
82-
go-version: "~1.22.4"
82+
go-version: "~1.23.4"
8383

8484
- name: Initialize CodeQL
8585
uses: github/codeql-action/init@v3

.github/workflows/e2e.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ jobs:
6161
uses: actions/setup-go@v5
6262
id: setup-go
6363
with:
64-
go-version: "~1.22.4"
64+
go-version: "~1.23.4"
6565
- name: Cache tools
6666
uses: actions/cache@v4
6767
with:

.github/workflows/release.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
- name: Set up Go
3737
uses: actions/setup-go@v5
3838
with:
39-
go-version: "~1.22.4"
39+
go-version: "~1.23.4"
4040

4141
- name: "generate release resources"
4242
run: make release-artifacts IMG_PREFIX="ghcr.io/open-telemetry/opentelemetry-operator" VERSION=${DESIRED_VERSION}

.github/workflows/scorecard.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
uses: actions/setup-go@v5
2727
id: setup-go
2828
with:
29-
go-version: "~1.22.4"
29+
go-version: "~1.23.4"
3030

3131
- name: Check out code into the Go module directory
3232
uses: actions/checkout@v4

renovate.json

+18
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,18 @@
33
"labels": ["dependencies"],
44
"enabledManagers": ["regex"],
55
"customManagers": [
6+
{
7+
"customType": "regex",
8+
"description" : "Update Go versions used for building in the CI",
9+
"datasourceTemplate": "golang-version",
10+
"depNameTemplate": "go",
11+
"fileMatch": [
12+
"(^|/)\\.github/workflows/.+\\.ya?ml$"
13+
],
14+
"matchStrings": [
15+
"go-version: \"~(?<currentValue>.+)\""
16+
]
17+
},
618
{
719
"customType": "regex",
820
"description" : "Update tool versions in the Makefile",
@@ -15,6 +27,12 @@
1527
}
1628
],
1729
"packageRules": [
30+
{
31+
"matchDatasources": ["golang-version"],
32+
"matchManagers": ["regex"],
33+
"matchFileNames": [".github/workflows/*.yaml", ".github/workflows/*.yml"],
34+
"commitMessageTopic": "go version in CI"
35+
},
1836
{
1937
"matchManagers": ["regex"],
2038
"matchFileNames": ["Makefile"],

0 commit comments

Comments
 (0)