deps: update Go to 1.22.0

This commit is contained in:
Malte Poll 2024-02-19 18:20:08 +01:00
parent fe85877679
commit 38ef546362
12 changed files with 16 additions and 16 deletions

View File

@ -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 # Download project root dependencies
WORKDIR /workspace WORKDIR /workspace

View File

@ -31,7 +31,7 @@ jobs:
- name: Setup Go environment - name: Setup Go environment
uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0 uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
with: with:
go-version: "1.21.6" go-version: "1.22.0"
cache: false cache: false
- name: Install Crane - name: Install Crane

View File

@ -69,7 +69,7 @@ jobs:
- name: Setup Go environment - name: Setup Go environment
uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0 uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
with: with:
go-version: "1.21.6" go-version: "1.22.0"
cache: false cache: false
- name: Determine version - name: Determine version

View File

@ -40,7 +40,7 @@ jobs:
if: matrix.language == 'go' if: matrix.language == 'go'
uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0 uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
with: with:
go-version: "1.21.6" go-version: "1.22.0"
cache: false cache: false
- name: Initialize CodeQL - name: Initialize CodeQL

View File

@ -233,7 +233,7 @@ jobs:
- name: Setup Go environment - name: Setup Go environment
uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0 uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
with: with:
go-version: "1.21.6" go-version: "1.22.0"
cache: true cache: true
- name: Build generateMeasurements tool - name: Build generateMeasurements tool

View File

@ -28,7 +28,7 @@ jobs:
- name: Setup Go environment - name: Setup Go environment
uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0 uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
with: with:
go-version: "1.21.6" go-version: "1.22.0"
cache: true cache: true
- name: Run code generation - name: Run code generation

View File

@ -6,7 +6,7 @@ RUN apt-get update && apt-get install -y \
git git
# Install Go # 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 && \ 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 && \ tar -C /usr/local -xzf go${GO_VER}.linux-amd64.tar.gz && \
rm go${GO_VER}.linux-amd64.tar.gz rm go${GO_VER}.linux-amd64.tar.gz

View File

@ -169,7 +169,7 @@ load("@io_bazel_rules_go//go:deps.bzl", "go_register_toolchains", "go_rules_depe
go_rules_dependencies() go_rules_dependencies()
go_register_toolchains(version = "1.21.6") go_register_toolchains(version = "1.22.0")
load("@bazel_gazelle//:deps.bzl", "gazelle_dependencies") load("@bazel_gazelle//:deps.bzl", "gazelle_dependencies")

View File

@ -9,11 +9,11 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
def go_deps(): def go_deps():
http_archive( http_archive(
name = "io_bazel_rules_go", name = "io_bazel_rules_go",
sha256 = "de7974538c31f76658e0d333086c69efdf6679dbc6a466ac29e65434bf47076d", sha256 = "80a98277ad1311dacd837f9b16db62887702e9f1d1c4c9f796d0121a46c8e184",
urls = [ urls = [
"https://mirror.bazel.build/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/de7974538c31f76658e0d333086c69efdf6679dbc6a466ac29e65434bf47076d", "https://cdn.confidential.cloud/constellation/cas/sha256/80a98277ad1311dacd837f9b16db62887702e9f1d1c4c9f796d0121a46c8e184",
"https://github.com/bazelbuild/rules_go/releases/download/v0.45.0/rules_go-v0.45.0.zip", "https://github.com/bazelbuild/rules_go/releases/download/v0.46.0/rules_go-v0.46.0.zip",
], ],
type = "zip", type = "zip",
) )

2
go.mod
View File

@ -1,6 +1,6 @@
module github.com/edgelesssys/constellation/v2 module github.com/edgelesssys/constellation/v2
go 1.21 go 1.22
replace ( replace (
k8s.io/api v0.0.0 => k8s.io/api v0.29.0 k8s.io/api v0.0.0 => k8s.io/api v0.29.0

View File

@ -1,6 +1,6 @@
go 1.21.6 go 1.22.0
toolchain go1.21.6 toolchain go1.22.0
use ( use (
. .

View File

@ -1,6 +1,6 @@
module github.com/edgelesssys/constellation/v2/hack/tools module github.com/edgelesssys/constellation/v2/hack/tools
go 1.21 go 1.22
require ( require (
github.com/google/go-licenses v1.6.0 github.com/google/go-licenses v1.6.0