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

Update Go to v1.22.6 #180

Merged
merged 1 commit into from
Aug 20, 2024
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
2 changes: 1 addition & 1 deletion .github/workflows/pre-main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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::"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/preflight.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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::"
Expand Down
8 changes: 4 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions Dockerfile.local
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
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/redhat-best-practices-for-k8s/oct

go 1.22.5
go 1.22.6

require (
github.com/Masterminds/semver/v3 v3.2.1
Expand Down
Loading