From 38ef5463626d9b8b578cd96c8b6beca7c1b25329 Mon Sep 17 00:00:00 2001 From: Malte Poll <1780588+malt3@users.noreply.github.com> Date: Mon, 19 Feb 2024 18:20:08 +0100 Subject: [PATCH] deps: update Go to 1.22.0 --- .github/actions/versionsapi/Dockerfile | 2 +- .github/workflows/build-ccm-gcp.yml | 2 +- .github/workflows/build-os-image-scheduled.yml | 2 +- .github/workflows/codeql.yml | 2 +- .github/workflows/release.yml | 2 +- .github/workflows/test-operator-codegen.yml | 2 +- 3rdparty/gcp-guest-agent/Dockerfile | 2 +- WORKSPACE.bazel | 2 +- bazel/toolchains/go_rules_deps.bzl | 8 ++++---- go.mod | 2 +- go.work | 4 ++-- hack/tools/go.mod | 2 +- 12 files changed, 16 insertions(+), 16 deletions(-) diff --git a/.github/actions/versionsapi/Dockerfile b/.github/actions/versionsapi/Dockerfile index fda878dc72..759170058c 100644 --- a/.github/actions/versionsapi/Dockerfile +++ b/.github/actions/versionsapi/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.21.6@sha256:6fbd2d3398db924f8d708cf6e94bd3a436bb468195daa6a96e80504e0a9615f2 as builder +FROM golang:1.22.0@sha256:7b297d9abee021bab9046e492506b3c2da8a3722cbf301653186545ecc1e00bb as builder # Download project root dependencies WORKDIR /workspace diff --git a/.github/workflows/build-ccm-gcp.yml b/.github/workflows/build-ccm-gcp.yml index 1d2f71a507..1517b02f34 100644 --- a/.github/workflows/build-ccm-gcp.yml +++ b/.github/workflows/build-ccm-gcp.yml @@ -31,7 +31,7 @@ jobs: - name: Setup Go environment uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0 with: - go-version: "1.21.6" + go-version: "1.22.0" cache: false - name: Install Crane diff --git a/.github/workflows/build-os-image-scheduled.yml b/.github/workflows/build-os-image-scheduled.yml index 7a4318f626..4a70f68d78 100644 --- a/.github/workflows/build-os-image-scheduled.yml +++ b/.github/workflows/build-os-image-scheduled.yml @@ -69,7 +69,7 @@ jobs: - name: Setup Go environment uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0 with: - go-version: "1.21.6" + go-version: "1.22.0" cache: false - name: Determine version diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 24ba1f613f..eb57c97aa6 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -40,7 +40,7 @@ jobs: if: matrix.language == 'go' uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0 with: - go-version: "1.21.6" + go-version: "1.22.0" cache: false - name: Initialize CodeQL diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 5b3f311243..de41c0c76e 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -233,7 +233,7 @@ jobs: - name: Setup Go environment uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0 with: - go-version: "1.21.6" + go-version: "1.22.0" cache: true - name: Build generateMeasurements tool diff --git a/.github/workflows/test-operator-codegen.yml b/.github/workflows/test-operator-codegen.yml index b39937a3b5..d8d583b9b4 100644 --- a/.github/workflows/test-operator-codegen.yml +++ b/.github/workflows/test-operator-codegen.yml @@ -28,7 +28,7 @@ jobs: - name: Setup Go environment uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0 with: - go-version: "1.21.6" + go-version: "1.22.0" cache: true - name: Run code generation diff --git a/3rdparty/gcp-guest-agent/Dockerfile b/3rdparty/gcp-guest-agent/Dockerfile index 61dd778ec4..178da44636 100644 --- a/3rdparty/gcp-guest-agent/Dockerfile +++ b/3rdparty/gcp-guest-agent/Dockerfile @@ -6,7 +6,7 @@ RUN apt-get update && apt-get install -y \ git # Install Go -ARG GO_VER=1.21.6 +ARG GO_VER=1.22.0 RUN wget -q https://go.dev/dl/go${GO_VER}.linux-amd64.tar.gz && \ tar -C /usr/local -xzf go${GO_VER}.linux-amd64.tar.gz && \ rm go${GO_VER}.linux-amd64.tar.gz diff --git a/WORKSPACE.bazel b/WORKSPACE.bazel index 6571b1120e..51db5ca5e1 100644 --- a/WORKSPACE.bazel +++ b/WORKSPACE.bazel @@ -169,7 +169,7 @@ load("@io_bazel_rules_go//go:deps.bzl", "go_register_toolchains", "go_rules_depe go_rules_dependencies() -go_register_toolchains(version = "1.21.6") +go_register_toolchains(version = "1.22.0") load("@bazel_gazelle//:deps.bzl", "gazelle_dependencies") diff --git a/bazel/toolchains/go_rules_deps.bzl b/bazel/toolchains/go_rules_deps.bzl index 65ebbeeac3..ab81aa5d4a 100644 --- a/bazel/toolchains/go_rules_deps.bzl +++ b/bazel/toolchains/go_rules_deps.bzl @@ -9,11 +9,11 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") def go_deps(): http_archive( name = "io_bazel_rules_go", - sha256 = "de7974538c31f76658e0d333086c69efdf6679dbc6a466ac29e65434bf47076d", + sha256 = "80a98277ad1311dacd837f9b16db62887702e9f1d1c4c9f796d0121a46c8e184", urls = [ - "https://mirror.bazel.build/github.com/bazelbuild/rules_go/releases/download/v0.45.0/rules_go-v0.45.0.zip", - "https://cdn.confidential.cloud/constellation/cas/sha256/de7974538c31f76658e0d333086c69efdf6679dbc6a466ac29e65434bf47076d", - "https://github.com/bazelbuild/rules_go/releases/download/v0.45.0/rules_go-v0.45.0.zip", + "https://mirror.bazel.build/github.com/bazelbuild/rules_go/releases/download/v0.46.0/rules_go-v0.46.0.zip", + "https://cdn.confidential.cloud/constellation/cas/sha256/80a98277ad1311dacd837f9b16db62887702e9f1d1c4c9f796d0121a46c8e184", + "https://github.com/bazelbuild/rules_go/releases/download/v0.46.0/rules_go-v0.46.0.zip", ], type = "zip", ) diff --git a/go.mod b/go.mod index ad786a9d0c..ab69a22003 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/edgelesssys/constellation/v2 -go 1.21 +go 1.22 replace ( k8s.io/api v0.0.0 => k8s.io/api v0.29.0 diff --git a/go.work b/go.work index 5a99e48afd..22d5025dab 100644 --- a/go.work +++ b/go.work @@ -1,6 +1,6 @@ -go 1.21.6 +go 1.22.0 -toolchain go1.21.6 +toolchain go1.22.0 use ( . diff --git a/hack/tools/go.mod b/hack/tools/go.mod index 1263e2e404..a68ccf8658 100644 --- a/hack/tools/go.mod +++ b/hack/tools/go.mod @@ -1,6 +1,6 @@ module github.com/edgelesssys/constellation/v2/hack/tools -go 1.21 +go 1.22 require ( github.com/google/go-licenses v1.6.0