Skip to content

Commit

Permalink
Merge pull request #2395 from aws-observability/UpgradeGo
Browse files Browse the repository at this point in the history
Upgrade go version to 1.20.10 and collector version
  • Loading branch information
humivo authored Oct 11, 2023
2 parents d846e79 + ce9f540 commit 542ae32
Show file tree
Hide file tree
Showing 9 changed files with 25 additions and 8 deletions.
5 changes: 4 additions & 1 deletion .github/workflows/CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ env:
DDB_TABLE_NAME: BatchTestCache
MAX_JOBS: 110
BATCH_INCLUDED_SERVICES: EKS,ECS,EC2,EKS_ARM64,EKS_FARGATE
GO_VERSION: ~1.20.9
GO_VERSION: ~1.20.10


concurrency:
Expand Down Expand Up @@ -130,6 +130,9 @@ jobs:
runs-on: ubuntu-latest

steps:
- name: Remove cache
run: rm -rf /opt/hostedtoolcache

- uses: actions/checkout@v3

- name: apply patches
Expand Down
5 changes: 4 additions & 1 deletion .github/workflows/PR-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ env:
IMAGE_NAME: aws-otel-collector
PACKAGING_ROOT: build/packages
TESTING_FRAMEWORK_REPO: aws-observability/aws-otel-test-framework
GO_VERSION: ~1.20.9
GO_VERSION: ~1.20.10

concurrency:
group: pr-build-${{ github.event.pull_request.number }}
Expand Down Expand Up @@ -134,6 +134,9 @@ jobs:
runs-on: ubuntu-latest
needs: [changes]
steps:
- name: Remove cache
run: rm -rf /opt/hostedtoolcache

- name: Checkout
if: ${{ needs.changes.outputs.changed == 'true' }}
uses: actions/checkout@v3
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/aws-resources-clean.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ on:
default: "3"
env:
DAYS_TO_KEEP: 3
GO_VERSION: ~1.20.9
GO_VERSION: ~1.20.10

permissions:
id-token: write
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/canary.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ jobs:
- name: Set up Go 1.x
uses: actions/setup-go@v4
with:
go-version: '~1.20.8'
go-version: '~1.20.10'
cache-dependency-path: testing-framework/cmd/aotutil/go.sum
- name: Build aotutil
run: cd testing-framework/cmd/aotutil && make build
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/perf.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ env:
COMMIT_USER: Github Actions
COMMIT_EMAIL: [email protected]
TESTING_FRAMEWORK_REPO: aws-observability/aws-otel-test-framework
GO_VERSION: ~1.20.9
GO_VERSION: ~1.20.10

permissions:
id-token: write
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/prod-image-mirror.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
- name: Set up Go 1.x
uses: actions/setup-go@v4
with:
go-version: ~1.20.8
go-version: ~1.20.10

- name: Configure AWS Credentials
uses: aws-actions/[email protected]
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v0.33.2
v0.33.3
11 changes: 11 additions & 0 deletions docs/releases/v0.33.3.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
# Changelog

## [v0.33.3](https://github.com/aws-observability/aws-otel-collector/tree/v0.33.3) (2023-10-10)

[Full Changelog](https://github.com/aws-observability/aws-otel-collector/compare/v0.33.2...v0.33.3)

**Merged pull requests:**

- Upgrade go version to 1.20.10 and collector version [\#2395](https://github.com/aws-observability/aws-otel-collector/pull/2395) ([humivo](https://github.com/humivo))

\* *This Changelog was automatically generated by [github_changelog_generator](https://github.com/github-changelog-generator/github-changelog-generator)*
2 changes: 1 addition & 1 deletion tools/packaging/windows/aws-otel-collector.wxs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<Product Id="EBBD8548-75D1-41D3-A402-ABE189F0C167"
UpgradeCode="B7C263DD-95A5-436A-A025-DCA5200C2BE3"
Name="ADOT Collector"
Version="0.33.2"
Version="0.33.3"
Codepage='1252'
Manufacturer="Amazon.com, Inc."
Language="1033">
Expand Down

0 comments on commit 542ae32

Please sign in to comment.