Update Go to v1.24.0 (#284)

Author: sebrandon1

.github/workflows/pre-main.yml

@@ -16,29 +16,27 @@ jobs:
     runs-on: ubuntu-22.04
 
     steps:
-      - name: Set up Go 1.23
-        uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # v5.3.0
-        with:
-          go-version: 1.23.6
-
-      - name: Disable default go problem matcher
-        run: echo "::remove-matcher owner=go::"
-
       - name: Check out code into the Go module directory
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           ref: ${{ github.sha }}
 
-      # TODO: golangci-lint team recommends using a GitHub Action to perform golangci-lint responsibilities.  However
-      # there does not appear to be a way to honor our existing .golangci.yml.  For now, mimic developer behavior.
-      - name: Install golangci-lint
-        run: make install-lint
+      - name: Set up Go
+        uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # v5.3.0
+        with:
+          go-version-file: go.mod
+
+      - name: Disable default go problem matcher
+        run: echo "::remove-matcher owner=go::"
 
       - name: make build-oct
         run: make build-oct
 
-      - name: make lint
-        run: make lint
+      - name: Golangci-lint
+        uses: golangci/golangci-lint-action@v6
+        with:
+          version: v1.64
+          args: --timeout 10m0s
 
       - name: make vet
         run: make vet

.github/workflows/preflight.yml

@@ -20,10 +20,10 @@ jobs:
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
 
-      - name: Set up Go 1.23
+      - name: Set up Go 1.24
         uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # v5.3.0
         with:
-          go-version: 1.23.6
+          go-version: 1.24.0
 
       - name: Disable default go problem matcher
         run: echo "::remove-matcher owner=go::"

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.23.6.linux-amd64.tar.gz
-ENV GO_BIN_URL_aarch64=${GO_DL_URL}/go1.23.6.linux-arm64.tar.gz
+ENV GO_BIN_URL_x86_64=${GO_DL_URL}/go1.24.0.linux-amd64.tar.gz
+ENV GO_BIN_URL_aarch64=${GO_DL_URL}/go1.24.0.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.23.6.linux-amd64.tar.gz; \
+		&& tar -C /usr/local -xzf ${TEMP_DIR}/go1.24.0.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.23.6.linux-arm64.tar.gz; \
+		&& tar -C /usr/local -xzf ${TEMP_DIR}/go1.24.0.linux-arm64.tar.gz; \
 	else \
 		echo "CPU architecture is not supported." && exit 1; \
 	fi

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.23.6.linux-amd64.tar.gz
-ENV GO_BIN_URL_aarch64=${GO_DL_URL}/go1.23.6.linux-arm64.tar.gz
+ENV GO_BIN_URL_x86_64=${GO_DL_URL}/go1.24.0.linux-amd64.tar.gz
+ENV GO_BIN_URL_aarch64=${GO_DL_URL}/go1.24.0.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.23.6.linux-amd64.tar.gz; \
+        && tar -C /usr/local -xzf ${TEMP_DIR}/go1.24.0.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.23.6.linux-arm64.tar.gz; \
+        && tar -C /usr/local -xzf ${TEMP_DIR}/go1.24.0.linux-arm64.tar.gz; \
     else \
         echo "CPU architecture is not supported." && exit 1; \
     fi

Makefile

@@ -25,7 +25,6 @@ GO_PACKAGES=$(shell go list ./... | grep -v vendor)
 	vet
 
 OCT_TOOL_NAME=oct
-GOLANGCI_VERSION=v1.64.3
 
 # Run the unit tests and build all binaries
 build:
@@ -64,9 +63,5 @@ update-deps:
 	go mod tidy && \
 	go mod vendor
 
-# Install golangci-lint	
-install-lint:
-	curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b ${GO_PATH}/bin ${GOLANGCI_VERSION}
-
 vet:
 	go vet ${GO_PACKAGES}

go.mod

@@ -1,6 +1,6 @@
 module github.com/redhat-best-practices-for-k8s/oct
 
-go 1.23.6
+go 1.24.0
 
 require (
 	github.com/Masterminds/semver/v3 v3.3.1