Skip to content

Commit

Permalink
Merge branch 'otel-upgrade' of github.com:aws/amazon-cloudwatch-agent…
Browse files Browse the repository at this point in the history
… into otel-upgrade
  • Loading branch information
zhihonl committed Sep 14, 2023
2 parents b20ab52 + b356eec commit 8f38a4c
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/PR-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ jobs:
if: needs.changes.outputs.lint == 'true'
uses: actions/setup-go@v4
with:
go-version: ~1.19.6
go-version: "1.20"
cache: false

- name: Check out code
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/integration-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ jobs:
- name: Set up Go 1.x
uses: actions/setup-go@v4
with:
go-version: ~1.19.6
go-version: "1.20"

- name: Generate matrix
id: set-matrix
Expand Down Expand Up @@ -129,7 +129,7 @@ jobs:
- name: Set up Go 1.x
uses: actions/setup-go@v2
with:
go-version: ~1.19.2
go-version: "1.20"

- name: Configure AWS Credentials
uses: aws-actions/configure-aws-credentials@v2
Expand Down Expand Up @@ -327,7 +327,7 @@ jobs:
- name: Set up Go 1.x
uses: actions/setup-go@v4
with:
go-version: ~1.19.6
go-version: "1.20"

- name: SetOutputs
id: set-outputs
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/otel-fork-replace.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
- name: Set up Go 1.x
uses: actions/setup-go@v4
with:
go-version: ~1.19.6
go-version: "1.20"
cache: false
- name: Update OTel fork components version
id: set-matrix
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/test-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ jobs:
- name: Set up Go 1.x
uses: actions/setup-go@v4
with:
go-version: ~1.19.6
go-version: "1.20"
cache: false

- name: Install rpm
Expand Down Expand Up @@ -161,7 +161,7 @@ jobs:
- name: Set up Go 1.x
uses: actions/setup-go@v4
with:
go-version: ~1.19.6
go-version: "1.20"

- name: Configure AWS Credentials
uses: aws-actions/configure-aws-credentials@v2
Expand Down Expand Up @@ -226,7 +226,7 @@ jobs:
- name: Set up Go 1.x
uses: actions/setup-go@v4
with:
go-version: ~1.19.6
go-version: "1.20"

- name: Configure AWS Credentials
uses: aws-actions/configure-aws-credentials@v2
Expand Down

0 comments on commit 8f38a4c

Please sign in to comment.