diff --git a/.github/workflows/pre-merge.yml b/.github/workflows/pre-merge.yml index d3a684fd..ae291f81 100644 --- a/.github/workflows/pre-merge.yml +++ b/.github/workflows/pre-merge.yml @@ -87,9 +87,8 @@ jobs: fail-fast: false matrix: project_folder: ${{ fromJson(needs.pre-checks.outputs.filtered_projects) }} - uses: open-edge-platform/orch-ci/.github/workflows/pre-merge.yml@cd3e9a8d77db98ea1b3001fd879bdf5a56baa5e7 # 2026.1.1 + uses: open-edge-platform/orch-ci/.github/workflows/pre-merge.yml@a54943a045a0f86e4e3f6807d2579fca50baf4fb # 2026.1.1 with: - orch_ci_repo_ref: 3712c26c7ae6e8b3cc53af6e9e6bd8d47dc61420 bootstrap_tools: "all,golangci-lint2" run_version_check: true run_dep_version_check: true diff --git a/dkam/Dockerfile b/dkam/Dockerfile index d151c220..f08fcded 100644 --- a/dkam/Dockerfile +++ b/dkam/Dockerfile @@ -1,7 +1,7 @@ # SPDX-FileCopyrightText: (C) 2025 Intel Corporation # SPDX-License-Identifier: Apache-2.0 -FROM golang:1.25.7-bookworm as build +FROM golang:1.26.1-bookworm as build SHELL ["/bin/bash", "-euo", "pipefail", "-c"] diff --git a/dkam/VERSION b/dkam/VERSION index 797cf72b..2b17ffd5 100644 --- a/dkam/VERSION +++ b/dkam/VERSION @@ -1 +1 @@ -1.34.0-dev +1.34.0 diff --git a/dkam/go.mod b/dkam/go.mod index f1f2fecf..95f5d2a1 100644 --- a/dkam/go.mod +++ b/dkam/go.mod @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 module github.com/open-edge-platform/infra-onboarding/dkam -go 1.25.7 +go 1.26.1 require ( github.com/fsnotify/fsnotify v1.9.0 diff --git a/onboarding-manager/Dockerfile b/onboarding-manager/Dockerfile index e54793db..a326534d 100644 --- a/onboarding-manager/Dockerfile +++ b/onboarding-manager/Dockerfile @@ -1,7 +1,7 @@ # SPDX-FileCopyrightText: (C) 2025 Intel Corporation # SPDX-License-Identifier: Apache-2.0 -FROM golang:1.25.7-bookworm as builder +FROM golang:1.26.1-bookworm as builder ENV GO111MODULE=on ARG MAKE_TARGET=go-build diff --git a/onboarding-manager/VERSION b/onboarding-manager/VERSION index c8a03e24..32b7211c 100644 --- a/onboarding-manager/VERSION +++ b/onboarding-manager/VERSION @@ -1 +1 @@ -1.40.0-dev +1.40.0 diff --git a/onboarding-manager/go.mod b/onboarding-manager/go.mod index 794ce257..9338706b 100644 --- a/onboarding-manager/go.mod +++ b/onboarding-manager/go.mod @@ -3,7 +3,7 @@ module github.com/open-edge-platform/infra-onboarding/onboarding-manager -go 1.25.7 +go 1.26.1 require ( github.com/envoyproxy/protoc-gen-validate v1.3.0 diff --git a/tink-worker/VERSION b/tink-worker/VERSION index b6bb93f7..f0bb29e7 100644 --- a/tink-worker/VERSION +++ b/tink-worker/VERSION @@ -1 +1 @@ -1.3.0-dev +1.3.0 diff --git a/tink-worker/go.mod b/tink-worker/go.mod index 44d48db1..1365f9c9 100644 --- a/tink-worker/go.mod +++ b/tink-worker/go.mod @@ -4,7 +4,7 @@ module github.com/tinkerbell/tink -go 1.25.5 +go 1.26.1 require ( github.com/cenkalti/backoff/v4 v4.3.0 diff --git a/tinker-actions/VERSION b/tinker-actions/VERSION index c6ba48dc..3500250a 100644 --- a/tinker-actions/VERSION +++ b/tinker-actions/VERSION @@ -1 +1 @@ -1.21.0-dev +1.21.0 diff --git a/tinker-actions/src/cexec/Dockerfile b/tinker-actions/src/cexec/Dockerfile index 9b49d3c0..ec25e8dd 100644 --- a/tinker-actions/src/cexec/Dockerfile +++ b/tinker-actions/src/cexec/Dockerfile @@ -5,7 +5,7 @@ # Original file can be found at https://github.com/tinkerbell/actions. # Build cexec -FROM golang:1.25.8-alpine3.23 AS cexec +FROM golang:1.26.1-alpine3.23 AS cexec RUN apk add --no-cache git ca-certificates gcc linux-headers musl-dev COPY . /src/cexec diff --git a/tinker-actions/src/cexec/go.mod b/tinker-actions/src/cexec/go.mod index 28182ac2..02adfff5 100644 --- a/tinker-actions/src/cexec/go.mod +++ b/tinker-actions/src/cexec/go.mod @@ -5,7 +5,7 @@ // Original file can be found at https://github.com/tinkerbell/actions. module cexec -go 1.25.8 +go 1.26.1 require ( github.com/open-edge-platform/infra-onboarding/tinker-actions/pkg/drive_detection v0.0.0 diff --git a/tinker-actions/src/image2disk/Dockerfile b/tinker-actions/src/image2disk/Dockerfile index 84dc5377..6614bbd6 100644 --- a/tinker-actions/src/image2disk/Dockerfile +++ b/tinker-actions/src/image2disk/Dockerfile @@ -4,7 +4,7 @@ # NOTICE: This file has been modified by Intel Corporation. # Original file can be found at https://github.com/tinkerbell/actions. -FROM golang:1.25.8-alpine3.23 AS image2disk +FROM golang:1.26.1-alpine3.23 AS image2disk RUN apk add --no-cache git ca-certificates gcc linux-headers musl-dev COPY . /src/image2disk COPY pkg /pkg/ diff --git a/tinker-actions/src/image2disk/go.mod b/tinker-actions/src/image2disk/go.mod index 7027c8f1..0c1ad062 100644 --- a/tinker-actions/src/image2disk/go.mod +++ b/tinker-actions/src/image2disk/go.mod @@ -6,7 +6,7 @@ module img2disk -go 1.25.8 +go 1.26.1 require ( github.com/cenkalti/backoff v2.2.1+incompatible diff --git a/tinker-actions/src/qemu_nbd_image2disk/Dockerfile b/tinker-actions/src/qemu_nbd_image2disk/Dockerfile index f84f48f8..d89fcc00 100644 --- a/tinker-actions/src/qemu_nbd_image2disk/Dockerfile +++ b/tinker-actions/src/qemu_nbd_image2disk/Dockerfile @@ -1,7 +1,7 @@ # SPDX-FileCopyrightText: (C) 2025 Intel Corporation # SPDX-License-Identifier: Apache-2.0 -FROM golang:1.25.8-alpine3.23 AS qemu-nbd-image2disk +FROM golang:1.26.1-alpine3.23 AS qemu-nbd-image2disk RUN apk add --no-cache git ca-certificates gcc linux-headers musl-dev COPY . /src/qemu-nbd-image2disk COPY pkg /pkg/ diff --git a/tinker-actions/src/qemu_nbd_image2disk/go.mod b/tinker-actions/src/qemu_nbd_image2disk/go.mod index 44616829..46db8e16 100644 --- a/tinker-actions/src/qemu_nbd_image2disk/go.mod +++ b/tinker-actions/src/qemu_nbd_image2disk/go.mod @@ -3,7 +3,7 @@ module qemu-nbd-img2disk -go 1.25.8 +go 1.26.1 require ( github.com/cenkalti/backoff v2.2.1+incompatible diff --git a/tinker-actions/src/securebootflag/Dockerfile b/tinker-actions/src/securebootflag/Dockerfile index fa64c6eb..e6bd49c2 100644 --- a/tinker-actions/src/securebootflag/Dockerfile +++ b/tinker-actions/src/securebootflag/Dockerfile @@ -1,7 +1,7 @@ # SPDX-FileCopyrightText: (C) 2025 Intel Corporation # SPDX-License-Identifier: Apache-2.0 -FROM golang:1.25.8-alpine3.23 as readsbstat +FROM golang:1.26.1-alpine3.23 as readsbstat COPY . /go/src/github.com/tinkerbell/hub/actions/read_sb_status WORKDIR /go/src/github.com/tinkerbell/hub/actions/read_sb_status diff --git a/tinker-actions/src/securebootflag/go.mod b/tinker-actions/src/securebootflag/go.mod index 0647d8e6..5575bad2 100644 --- a/tinker-actions/src/securebootflag/go.mod +++ b/tinker-actions/src/securebootflag/go.mod @@ -3,6 +3,6 @@ module securebootflag -go 1.25.8 +go 1.26.1 //toolchain go1.21.4 diff --git a/tinker-actions/src/writefile/Dockerfile b/tinker-actions/src/writefile/Dockerfile index c1845b33..e0e56abb 100644 --- a/tinker-actions/src/writefile/Dockerfile +++ b/tinker-actions/src/writefile/Dockerfile @@ -5,7 +5,7 @@ # Original file can be found at https://github.com/tinkerbell/actions. # Build stream -FROM golang:1.25.8-alpine3.23 AS writefile +FROM golang:1.26.1-alpine3.23 AS writefile RUN apk add --no-cache git ca-certificates gcc musl-dev COPY . /go/src/github.com/tinkerbell/hub/actions/writefile/v1 COPY pkg /go/src/github.com/tinkerbell/hub/actions/pkg diff --git a/tinker-actions/src/writefile/go.mod b/tinker-actions/src/writefile/go.mod index 3018b76a..6baab9e3 100644 --- a/tinker-actions/src/writefile/go.mod +++ b/tinker-actions/src/writefile/go.mod @@ -3,7 +3,7 @@ module github.com/tinkerbell/hub/actions/writefile/v1 -go 1.25.8 +go 1.26.1 require ( github.com/open-edge-platform/infra-onboarding/tinker-actions/pkg/drive_detection v0.0.0-20250324105403-f8fa27a1b024 diff --git a/version.mk b/version.mk index 520a69ef..29a05c76 100644 --- a/version.mk +++ b/version.mk @@ -2,10 +2,10 @@ # SPDX-License-Identifier: Apache-2.0 GOLINTVERSION_HAVE := $(shell golangci-lint version | sed 's/.*version //' | sed 's/ .*//') -GOLINTVERSION_REQ := 2.8.0 +GOLINTVERSION_REQ := 2.9.0 GOJUNITREPORTVERSION_HAVE := $(shell go-junit-report -version | sed s/.*" v"// | sed 's/ .*//') GOJUNITREPORTVERSION_REQ := 2.1.0 -GOVERSION_REQ := 1.25.7 +GOVERSION_REQ := 1.26.1 GOVERSION_HAVE := $(shell go version | sed 's/.*version go//' | sed 's/ .*//') GCC_REQ := $(shell command -v gcc) PROTOCGENDOCVERSION_HAVE := $(shell protoc-gen-doc --version | sed s/.*"version "// | sed 's/ .*//')