Skip to content

Commit

Permalink
[chore] update go to 1.21.11/1.22.4 (#10321) (#10325)
Browse files Browse the repository at this point in the history
Backport of #10321

Signed-off-by: Alex Boten <223565+codeboten@users.noreply.github.com>
Co-authored-by: Alex Boten <223565+codeboten@users.noreply.github.com>
  • Loading branch information
mx-psi and codeboten authored Jun 5, 2024
1 parent 5cbf8be commit 0ab388b
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build-and-test-arm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
- uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
- uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1
with:
go-version: "~1.22.3"
go-version: "~1.22.4"
cache: false
- name: Cache Go
id: go-cache
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/build-and-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
- name: Setup Go
uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1
with:
go-version: ~1.21.10
go-version: ~1.21.11
cache: false
- name: Cache Go
id: go-cache
Expand All @@ -45,7 +45,7 @@ jobs:
- name: Setup Go
uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1
with:
go-version: ~1.21.10
go-version: ~1.21.11
cache: false
- name: Cache Go
id: go-cache
Expand All @@ -69,7 +69,7 @@ jobs:
- name: Setup Go
uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1
with:
go-version: ~1.21.10
go-version: ~1.21.11
cache: false
- name: Cache Go
id: go-cache
Expand All @@ -94,7 +94,7 @@ jobs:
- name: Setup Go
uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1
with:
go-version: ~1.21.10
go-version: ~1.21.11
cache: false
- name: Cache Go
id: go-cache
Expand Down Expand Up @@ -141,7 +141,7 @@ jobs:
strategy:
matrix:
runner: [ubuntu-latest]
go-version: ["~1.22", "~1.21.10"] # 1.20 needs quotes otherwise it's interpreted as 1.2
go-version: ["~1.22", "~1.21.11"] # 1.20 needs quotes otherwise it's interpreted as 1.2
runs-on: ${{ matrix.runner }}
needs: [setup-environment]
steps:
Expand Down Expand Up @@ -201,7 +201,7 @@ jobs:
- name: Setup Go
uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1
with:
go-version: ~1.21.10
go-version: ~1.21.11
cache: false
- name: Cache Go
id: go-cache
Expand Down Expand Up @@ -263,7 +263,7 @@ jobs:
- name: Setup Go
uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1
with:
go-version: ~1.21.10
go-version: ~1.21.11
cache: false
- name: Cache Go
id: go-cache
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tidy-dependencies.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
ref: ${{ github.head_ref }}
- uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1
with:
go-version: ~1.21.10
go-version: ~1.21.11
cache: false
- name: Cache Go
id: go-cache
Expand Down
2 changes: 1 addition & 1 deletion cmd/otelcorecol/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ module go.opentelemetry.io/collector/cmd/otelcorecol

go 1.21.0

toolchain go1.21.10
toolchain go1.21.11

require (
go.opentelemetry.io/collector/component v0.102.0
Expand Down
2 changes: 1 addition & 1 deletion pdata/pprofile/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ module go.opentelemetry.io/collector/pdata/pprofile

go 1.21.0

toolchain go1.21.10
toolchain go1.21.11

require (
github.com/stretchr/testify v1.9.0
Expand Down

0 comments on commit 0ab388b

Please sign in to comment.