Skip to content

Commit

Permalink
[chore] bump go 1.21.12 (#10521)
Browse files Browse the repository at this point in the history
Removed the toolchain directive in pprof/go.mod as it's unnecessary

Signed-off-by: Alex Boten <223565+codeboten@users.noreply.github.com>
  • Loading branch information
codeboten committed Jul 3, 2024
1 parent 8d3c19d commit 63ce469
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 12 deletions.
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.11
go-version: ~1.21.12
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.11
go-version: ~1.21.12
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.11
go-version: ~1.21.12
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.11
go-version: ~1.21.12
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.11"] # 1.20 needs quotes otherwise it's interpreted as 1.2
go-version: ["~1.22", "~1.21.12"] # 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.11
go-version: ~1.21.12
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.11
go-version: ~1.21.12
cache: false
- name: Cache Go
id: go-cache
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/tidy-dependencies.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ permissions:
jobs:
setup-environment:
permissions:
contents: write # for Git to git push
contents: write # for Git to git push
timeout-minutes: 30
runs-on: ubuntu-latest
if: ${{ !contains(github.event.pull_request.labels.*.name, 'dependency-major-update') && (github.actor == 'renovate[bot]' || contains(github.event.pull_request.labels.*.name, 'renovatebot')) }}
Expand All @@ -21,7 +21,7 @@ jobs:
ref: ${{ github.head_ref }}
- uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1
with:
go-version: ~1.21.11
go-version: ~1.21.12
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.11
toolchain go1.21.12

require (
go.opentelemetry.io/collector/component v0.104.0
Expand Down
2 changes: 0 additions & 2 deletions pdata/pprofile/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@ module go.opentelemetry.io/collector/pdata/pprofile

go 1.21.0

toolchain go1.21.11

require (
github.com/stretchr/testify v1.9.0
go.opentelemetry.io/collector/pdata v1.11.0
Expand Down

0 comments on commit 63ce469

Please sign in to comment.