From c0cc7fc8ef8d0d13b34f78781fe20e94b3df410e Mon Sep 17 00:00:00 2001 From: Prateek Chaudhry Date: Fri, 9 Feb 2024 17:22:54 -0800 Subject: [PATCH] update golang to 1.20.12 --- .github/workflows/static.yml | 9 +++------ GO_VERSION | 2 +- GO_VERSION_WINDOWS | 2 +- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/.github/workflows/static.yml b/.github/workflows/static.yml index c511104df7d..2247990bf42 100644 --- a/.github/workflows/static.yml +++ b/.github/workflows/static.yml @@ -16,8 +16,7 @@ jobs: run: | cd $GITHUB_WORKSPACE/src/github.com/aws/amazon-ecs-agent set -eou pipefail - go_version=$(cat -e GO_VERSION) - go_version=${go_version%?} + go_version=$(cat GO_VERSION | tr -d '\n') go_version_length=${#go_version} go_version_re="^([0-9]+\.){1,2}([0-9]+)$" if ! [[ $go_version_length -le 10 && $go_version =~ $go_version_re ]] ; then @@ -52,8 +51,7 @@ jobs: run: | cd $GITHUB_WORKSPACE/src/github.com/aws/amazon-ecs-agent set -eou pipefail - go_version=$(cat -e GO_VERSION) - go_version=${go_version%?} + go_version=$(cat GO_VERSION | tr -d '\n') go_version_length=${#go_version} go_version_re="^([0-9]+\.){1,2}([0-9]+)$" if ! [[ $go_version_length -le 10 && $go_version =~ $go_version_re ]] ; then @@ -88,8 +86,7 @@ jobs: run: | cd $GITHUB_WORKSPACE/src/github.com/aws/amazon-ecs-agent set -eou pipefail - go_version=$(cat -e GO_VERSION) - go_version=${go_version%?} + go_version=$(cat GO_VERSION | tr -d '\n') go_version_length=${#go_version} go_version_re="^([0-9]+\.){1,2}([0-9]+)$" if ! [[ $go_version_length -le 10 && $go_version =~ $go_version_re ]] ; then diff --git a/GO_VERSION b/GO_VERSION index acdfc7930c8..adcfeed9139 100644 --- a/GO_VERSION +++ b/GO_VERSION @@ -1 +1 @@ -1.20.10 +1.20.12 \ No newline at end of file diff --git a/GO_VERSION_WINDOWS b/GO_VERSION_WINDOWS index acdfc7930c8..adcfeed9139 100644 --- a/GO_VERSION_WINDOWS +++ b/GO_VERSION_WINDOWS @@ -1 +1 @@ -1.20.10 +1.20.12 \ No newline at end of file