Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix github actions to use go 1.19. #633

Merged
merged 1 commit into from
Nov 4, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/build-test-linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,12 @@ concurrency:
jobs:
linux-unittest:
runs-on: ubuntu-latest
steps:
steps:

- name: Set up Go 1.x
uses: actions/setup-go@v2
with:
go-version: ~1.18.3
go-version: ~1.19.2

- name: Check out code
uses: actions/checkout@v2
Expand All @@ -41,7 +41,7 @@ jobs:

- uses: zencargo/github-action-go-mod-tidy@v1
with:
go-version: 1.18.3
go-version: 1.19.2

- name: Cache build output
uses: actions/cache@v2
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/build-test-macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:
- '**/*.md'
- '.github/**'
- '!.github/workflows/build-*'


pull_request:
types: [opened, synchronize, reopened, ready_for_review]
Expand All @@ -22,12 +22,12 @@ concurrency:
jobs:
macos-unittest:
runs-on: macos-latest
steps:
steps:

- name: Set up Go 1.x
uses: actions/setup-go@v2
with:
go-version: ~1.18.3
go-version: ~1.19.2

- name: Check out code
uses: actions/checkout@v2
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-test-windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
- name: Setup Go
uses: actions/setup-go@v2
with:
go-version: ~1.18.3
go-version: ~1.19.2

- name: Cache Go
uses: actions/cache@v2
Expand Down
18 changes: 9 additions & 9 deletions .github/workflows/integrationTest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:
- name: Set up Go 1.x
uses: actions/setup-go@v2
with:
go-version: ~1.18.3
go-version: ~1.19.2

- name: Install rpm
run: sudo apt install rpm
Expand Down Expand Up @@ -135,7 +135,7 @@ jobs:
- name: Set up Go 1.x
uses: actions/setup-go@v2
with:
go-version: ~1.18.3
go-version: ~1.19.2

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

- name: Configure AWS Credentials
uses: aws-actions/configure-aws-credentials@v1
Expand All @@ -192,7 +192,7 @@ jobs:
if: steps.cached_win_zip.outputs.cache-hit != 'true'
run: |
sudo apt install unzip
unzip windows/amd64/amazon-cloudwatch-agent.zip -d windows-agent
unzip windows/amd64/amazon-cloudwatch-agent.zip -d windows-agent

- name: Create msi dep folder and copy deps
if: steps.cached_win_zip.outputs.cache-hit != 'true'
Expand Down Expand Up @@ -230,7 +230,7 @@ jobs:
- name: Set up Go 1.x
uses: actions/setup-go@v2
with:
go-version: ~1.18.3
go-version: ~1.19.2

- name: Configure AWS Credentials
uses: aws-actions/configure-aws-credentials@v1
Expand Down Expand Up @@ -483,7 +483,7 @@ jobs:
else
terraform destroy -auto-approve && exit 1
fi

#This is here just in case workflow cancel
- name: Terraform destroy
if: ${{ cancelled() && steps.ec2-nvidia-integration-test.outputs.cache-hit != 'true' }}
Expand All @@ -493,13 +493,13 @@ jobs:
timeout_minutes: 8
retry_wait_seconds: 5
command: |
if "${{ matrix.arrays.os }}" == window
if "${{ matrix.arrays.os }}" == window
cd terraform/ec2/win
else
cd terraform/ec2/linux
fi
terraform destroy --auto-approve

EC2LinuxIntegrationTest:
needs: [MakeBinary, StartLocalStack, GenerateTestMatrix]
name: 'EC2LinuxIntegrationTest'
Expand Down Expand Up @@ -723,7 +723,7 @@ jobs:
command: |
cd terraform/ecs/linux
terraform init
if terraform apply --auto-approve -var="test_dir=${{ matrix.arrays.test_dir }}" -var="cwagent_image_repo=${{ steps.login-ecr.outputs.registry }}/${{ env.ECR_INTEGRATION_TEST_REPO }}" -var="cwagent_image_tag=${{ github.sha }}" ; then
if terraform apply --auto-approve -var="test_dir=${{ matrix.arrays.test_dir }}" -var="cwagent_image_repo=${{ steps.login-ecr.outputs.registry }}/${{ env.ECR_INTEGRATION_TEST_REPO }}" -var="cwagent_image_tag=${{ github.sha }}" ; then
terraform destroy -auto-approve
else
terraform destroy -auto-approve && exit 1
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/nightly-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
- name: Set up Go 1.x
uses: actions/setup-go@v2
with:
go-version: ~1.18.3
go-version: ~1.19.2
id: go

- name: Configure AWS Credentials
Expand Down
7 changes: 3 additions & 4 deletions .github/workflows/releaseTest.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
# SPDX-License-Identifier: MIT

name: Release Update
name: Release Update
env:
PRIVATE_KEY: ${{ secrets.AWS_PRIVATE_KEY }}
TERRAFORM_AWS_ASSUME_ROLE: ${{ secrets.TERRAFORM_AWS_ASSUME_ROLE }}
Expand All @@ -17,7 +17,7 @@ env:
on:
release:
types: [created]

workflow_dispatch:

concurrency:
Expand All @@ -37,7 +37,7 @@ jobs:
- name: Set up Go 1.x
uses: actions/setup-go@v2
with:
go-version: ~1.18.3
go-version: ~1.19.2
- name: Configure AWS Credentials
uses: aws-actions/configure-aws-credentials@v1
with:
Expand All @@ -52,4 +52,3 @@ jobs:
export SHA=$GITHUB_SHA
export RELEASE_NAME=${{ github.event.release.tag_name }}
go test -run TestUpdateCommit -p 1 -v --tags=integration

2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/aws/amazon-cloudwatch-agent

go 1.18
go 1.19
adam-mateen marked this conversation as resolved.
Show resolved Hide resolved

replace github.com/influxdata/telegraf => github.com/aws/telegraf v0.10.2-0.20220502160831-c20ebe67c5ef

Expand Down