From 65171427140e8a027c1c658702cc9243f6c40609 Mon Sep 17 00:00:00 2001 From: Brandon Palm Date: Tue, 20 Aug 2024 08:38:01 -0500 Subject: [PATCH] Update Go to v1.22.6 --- .github/workflows/pre-main.yml | 2 +- .github/workflows/preflight.yml | 2 +- Dockerfile | 8 ++++---- Dockerfile.local | 8 ++++---- go.mod | 2 +- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pre-main.yml b/.github/workflows/pre-main.yml index 6022403..987857c 100644 --- a/.github/workflows/pre-main.yml +++ b/.github/workflows/pre-main.yml @@ -19,7 +19,7 @@ jobs: - name: Set up Go 1.22 uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2 with: - go-version: 1.22.5 + go-version: 1.22.6 - name: Disable default go problem matcher run: echo "::remove-matcher owner=go::" diff --git a/.github/workflows/preflight.yml b/.github/workflows/preflight.yml index 3f4c905..1f2d5d3 100644 --- a/.github/workflows/preflight.yml +++ b/.github/workflows/preflight.yml @@ -23,7 +23,7 @@ jobs: - name: Set up Go 1.22 uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2 with: - go-version: 1.22.5 + go-version: 1.22.6 - name: Disable default go problem matcher run: echo "::remove-matcher owner=go::" diff --git a/Dockerfile b/Dockerfile index be5eba6..c5aaf94 100644 --- a/Dockerfile +++ b/Dockerfile @@ -11,19 +11,19 @@ RUN yum install -y gcc git jq make wget ENV \ GO_DL_URL=https://golang.org/dl \ GOPATH=/root/go -ENV GO_BIN_URL_x86_64=${GO_DL_URL}/go1.22.5.linux-amd64.tar.gz -ENV GO_BIN_URL_aarch64=${GO_DL_URL}/go1.22.5.linux-arm64.tar.gz +ENV GO_BIN_URL_x86_64=${GO_DL_URL}/go1.22.6.linux-amd64.tar.gz +ENV GO_BIN_URL_aarch64=${GO_DL_URL}/go1.22.6.linux-arm64.tar.gz # Determine the CPU architecture and download the appropriate Go binary RUN \ if [ "$(uname -m)" = x86_64 ]; then \ wget --directory-prefix=${TEMP_DIR} ${GO_BIN_URL_x86_64} --quiet \ && rm -rf /usr/local/go \ - && tar -C /usr/local -xzf ${TEMP_DIR}/go1.22.5.linux-amd64.tar.gz; \ + && tar -C /usr/local -xzf ${TEMP_DIR}/go1.22.6.linux-amd64.tar.gz; \ elif [ "$(uname -m)" = aarch64 ]; then \ wget --directory-prefix=${TEMP_DIR} ${GO_BIN_URL_aarch64} --quiet \ && rm -rf /usr/local/go \ - && tar -C /usr/local -xzf ${TEMP_DIR}/go1.22.5.linux-arm64.tar.gz; \ + && tar -C /usr/local -xzf ${TEMP_DIR}/go1.22.6.linux-arm64.tar.gz; \ else \ echo "CPU architecture is not supported." && exit 1; \ fi diff --git a/Dockerfile.local b/Dockerfile.local index f9e60e1..8d5e0cd 100644 --- a/Dockerfile.local +++ b/Dockerfile.local @@ -11,19 +11,19 @@ RUN yum install -y gcc git jq make wget ENV \ GO_DL_URL=https://golang.org/dl \ GOPATH=/root/go -ENV GO_BIN_URL_x86_64=${GO_DL_URL}/go1.22.5.linux-amd64.tar.gz -ENV GO_BIN_URL_aarch64=${GO_DL_URL}/go1.22.5.linux-arm64.tar.gz +ENV GO_BIN_URL_x86_64=${GO_DL_URL}/go1.22.6.linux-amd64.tar.gz +ENV GO_BIN_URL_aarch64=${GO_DL_URL}/go1.22.6.linux-arm64.tar.gz # Determine the CPU architecture and download the appropriate Go binary RUN \ if [ "$(uname -m)" = x86_64 ]; then \ wget --directory-prefix=${TEMP_DIR} ${GO_BIN_URL_x86_64} --quiet \ && rm -rf /usr/local/go \ - && tar -C /usr/local -xzf ${TEMP_DIR}/go1.22.5.linux-amd64.tar.gz; \ + && tar -C /usr/local -xzf ${TEMP_DIR}/go1.22.6.linux-amd64.tar.gz; \ elif [ "$(uname -m)" = aarch64 ]; then \ wget --directory-prefix=${TEMP_DIR} ${GO_BIN_URL_aarch64} --quiet \ && rm -rf /usr/local/go \ - && tar -C /usr/local -xzf ${TEMP_DIR}/go1.22.5.linux-arm64.tar.gz; \ + && tar -C /usr/local -xzf ${TEMP_DIR}/go1.22.6.linux-arm64.tar.gz; \ else \ echo "CPU architecture is not supported." && exit 1; \ fi diff --git a/go.mod b/go.mod index b1c978e..bc8e146 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/redhat-best-practices-for-k8s/oct -go 1.22.5 +go 1.22.6 require ( github.com/Masterminds/semver/v3 v3.2.1