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.

Sign up for GitHub

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

Jump to bottom

deps: bazel, Go, nix #2824

Merged
merged 6 commits into from Jan 22, 2024
Merged

deps: bazel, Go, nix #2824

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b80cff6
image: mark image upload as manual bazel target
malt3 Jan 15, 2024
5739df6
deps: update hermetic_cc_toolchain
malt3 Jan 15, 2024
a398e01
deps: update gazelle and rules_go
malt3 Jan 15, 2024
ee45217
nix: update flake.lock
malt3 Jan 15, 2024
367d9c7
deps: Go 1.21.6
malt3 Jan 15, 2024
0bd35a0
goleak: ignore rules_go SIGTERM handler
malt3 Jan 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/actions/versionsapi/Dockerfile
View file
Open in desktop
@@ -1,4 +1,4 @@
FROM golang:1.21.5@sha256:1a9d253b11048b1c76b690b0c09d78d200652e4e913d5d1dcc8eb8d0d932bfe4 as builder
FROM golang:1.21.6@sha256:6fbd2d3398db924f8d708cf6e94bd3a436bb468195daa6a96e80504e0a9615f2 as builder

# Download project root dependencies
WORKDIR /workspace
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-ccm-gcp.yml
View file
Open in desktop
Expand Up @@ -31,7 +31,7 @@ jobs:
- name: Setup Go environment
uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
with:
go-version: "1.21.5"
go-version: "1.21.6"
cache: false

- name: Install Crane
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-os-image-scheduled.yml
View file
Open in desktop
Expand Up @@ -69,7 +69,7 @@ jobs:
- name: Setup Go environment
uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
with:
go-version: "1.21.5"
go-version: "1.21.6"
cache: false

- name: Determine version
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/codeql.yml
View file
Open in desktop
Expand Up @@ -40,7 +40,7 @@ jobs:
if: matrix.language == 'go'
uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
with:
go-version: "1.21.5"
go-version: "1.21.6"
cache: false

- name: Initialize CodeQL
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
View file
Open in desktop
Expand Up @@ -233,7 +233,7 @@ jobs:
- name: Setup Go environment
uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
with:
go-version: "1.21.5"
go-version: "1.21.6"
cache: true

- name: Build generateMeasurements tool
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-operator-codegen.yml
View file
Open in desktop
Expand Up @@ -28,7 +28,7 @@ jobs:
- name: Setup Go environment
uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
with:
go-version: "1.21.5"
go-version: "1.21.6"
cache: true

- name: Run code generation
Expand Down
2 changes: 1 addition & 1 deletion 3rdparty/gcp-guest-agent/Dockerfile
View file
Open in desktop
Expand Up @@ -6,7 +6,7 @@ RUN apt-get update && apt-get install -y \
git

# Install Go
ARG GO_VER=1.21.5
ARG GO_VER=1.21.6
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
Expand Down
2 changes: 1 addition & 1 deletion WORKSPACE.bazel
View file
Open in desktop
Expand Up @@ -157,7 +157,7 @@ load("@io_bazel_rules_go//go:deps.bzl", "go_register_toolchains", "go_rules_depe

go_rules_dependencies()

go_register_toolchains(version = "1.21.5")
go_register_toolchains(version = "1.21.6")

load("@bazel_gazelle//:deps.bzl", "gazelle_dependencies")

Expand Down
16 changes: 8 additions & 8 deletions bazel/toolchains/go_rules_deps.bzl
View file
Open in desktop
Expand Up @@ -9,21 +9,21 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
def go_deps():
http_archive(
name = "io_bazel_rules_go",
sha256 = "91585017debb61982f7054c9688857a2ad1fd823fc3f9cb05048b0025c47d023",
sha256 = "de7974538c31f76658e0d333086c69efdf6679dbc6a466ac29e65434bf47076d",
urls = [
"https://mirror.bazel.build/github.com/bazelbuild/rules_go/releases/download/v0.42.0/rules_go-v0.42.0.zip",
"https://cdn.confidential.cloud/constellation/cas/sha256/91585017debb61982f7054c9688857a2ad1fd823fc3f9cb05048b0025c47d023",
"https://github.com/bazelbuild/rules_go/releases/download/v0.42.0/rules_go-v0.42.0.zip",
"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",
],
type = "zip",
)
http_archive(
name = "bazel_gazelle",
sha256 = "b7387f72efb59f876e4daae42f1d3912d0d45563eac7cb23d1de0b094ab588cf",
sha256 = "32938bda16e6700063035479063d9d24c60eda8d79fd4739563f50d331cb3209",
urls = [
"https://mirror.bazel.build/github.com/bazelbuild/bazel-gazelle/releases/download/v0.34.0/bazel-gazelle-v0.34.0.tar.gz",
"https://cdn.confidential.cloud/constellation/cas/sha256/b7387f72efb59f876e4daae42f1d3912d0d45563eac7cb23d1de0b094ab588cf",
"https://github.com/bazelbuild/bazel-gazelle/releases/download/v0.34.0/bazel-gazelle-v0.34.0.tar.gz",
"https://mirror.bazel.build/github.com/bazelbuild/bazel-gazelle/releases/download/v0.35.0/bazel-gazelle-v0.35.0.tar.gz",
"https://cdn.confidential.cloud/constellation/cas/sha256/32938bda16e6700063035479063d9d24c60eda8d79fd4739563f50d331cb3209",
"https://github.com/bazelbuild/bazel-gazelle/releases/download/v0.35.0/bazel-gazelle-v0.35.0.tar.gz",
],
type = "tar.gz",
)
6 changes: 3 additions & 3 deletions bazel/toolchains/hermetic_cc_deps.bzl
View file
Open in desktop
Expand Up @@ -8,9 +8,9 @@ def hermetic_cc_deps():
http_archive(
name = "hermetic_cc_toolchain",
urls = [
"https://cdn.confidential.cloud/constellation/cas/sha256/a5caccbf6d86d4f60afd45b541a05ca4cc3f5f523aec7d3f7711e584600fb075",
"https://github.com/uber/hermetic_cc_toolchain/releases/download/v2.1.3/hermetic_cc_toolchain-v2.1.3.tar.gz",
"https://cdn.confidential.cloud/constellation/cas/sha256/3b8107de0d017fe32e6434086a9568f97c60a111b49dc34fc7001e139c30fdea",
"https://github.com/uber/hermetic_cc_toolchain/releases/download/v2.2.1/hermetic_cc_toolchain-v2.2.1.tar.gz",
],
type = "tar.gz",
sha256 = "a5caccbf6d86d4f60afd45b541a05ca4cc3f5f523aec7d3f7711e584600fb075",
sha256 = "3b8107de0d017fe32e6434086a9568f97c60a111b49dc34fc7001e139c30fdea",
)
2 changes: 1 addition & 1 deletion bootstrapper/internal/clean/clean_test.go
View file
Open in desktop
Expand Up @@ -16,7 +16,7 @@ import (
)

func TestMain(m *testing.M) {
goleak.VerifyTestMain(m)
goleak.VerifyTestMain(m, goleak.IgnoreAnyFunction("github.com/bazelbuild/rules_go/go/tools/bzltestutil.RegisterTimeoutHandler.func1"))
}

func TestNew(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion bootstrapper/internal/diskencryption/diskencryption_test.go
View file
Open in desktop
Expand Up @@ -18,7 +18,7 @@ import (
)

func TestMain(m *testing.M) {
goleak.VerifyTestMain(m)
goleak.VerifyTestMain(m, goleak.IgnoreAnyFunction("github.com/bazelbuild/rules_go/go/tools/bzltestutil.RegisterTimeoutHandler.func1"))
}

func TestUpdatePassphrase(t *testing.T) {
Expand Down
1 change: 1 addition & 0 deletions bootstrapper/internal/initserver/initserver_test.go
View file
Open in desktop
Expand Up @@ -38,6 +38,7 @@ func TestMain(m *testing.M) {
goleak.VerifyTestMain(m,
// https://github.com/census-instrumentation/opencensus-go/issues/1262
goleak.IgnoreTopFunction("go.opencensus.io/stats/view.(*worker).start"),
goleak.IgnoreAnyFunction("github.com/bazelbuild/rules_go/go/tools/bzltestutil.RegisterTimeoutHandler.func1"),
)
}

Expand Down
2 changes: 1 addition & 1 deletion bootstrapper/internal/joinclient/joinclient_test.go
View file
Open in desktop
Expand Up @@ -35,7 +35,7 @@ import (
)

func TestMain(m *testing.M) {
goleak.VerifyTestMain(m)
goleak.VerifyTestMain(m, goleak.IgnoreAnyFunction("github.com/bazelbuild/rules_go/go/tools/bzltestutil.RegisterTimeoutHandler.func1"))
}

func TestClient(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion bootstrapper/internal/kubernetes/k8sapi/kubeadm_config_test.go
View file
Open in desktop
Expand Up @@ -18,7 +18,7 @@ import (
)

func TestMain(m *testing.M) {
goleak.VerifyTestMain(m)
goleak.VerifyTestMain(m, goleak.IgnoreAnyFunction("github.com/bazelbuild/rules_go/go/tools/bzltestutil.RegisterTimeoutHandler.func1"))
}

func TestInitConfiguration(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion bootstrapper/internal/kubernetes/kubernetes_test.go
View file
Open in desktop
Expand Up @@ -30,7 +30,7 @@ import (
)

func TestMain(m *testing.M) {
goleak.VerifyTestMain(m)
goleak.VerifyTestMain(m, goleak.IgnoreAnyFunction("github.com/bazelbuild/rules_go/go/tools/bzltestutil.RegisterTimeoutHandler.func1"))
}

func TestInitCluster(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion bootstrapper/internal/kubernetes/kubewaiter/kubewaiter_test.go
View file
Open in desktop
Expand Up @@ -17,7 +17,7 @@ import (
)

func TestMain(m *testing.M) {
goleak.VerifyTestMain(m)
goleak.VerifyTestMain(m, goleak.IgnoreAnyFunction("github.com/bazelbuild/rules_go/go/tools/bzltestutil.RegisterTimeoutHandler.func1"))
}

func TestCloudKubeAPIWaiter(t *testing.T) {
Expand Down
1 change: 1 addition & 0 deletions cli/internal/cloudcmd/clients_test.go
View file
Open in desktop
Expand Up @@ -23,6 +23,7 @@ func TestMain(m *testing.M) {
goleak.VerifyTestMain(m,
// https://github.com/census-instrumentation/opencensus-go/issues/1262
goleak.IgnoreTopFunction("go.opencensus.io/stats/view.(*worker).start"),
goleak.IgnoreAnyFunction("github.com/bazelbuild/rules_go/go/tools/bzltestutil.RegisterTimeoutHandler.func1"),
)
}

Expand Down
1 change: 1 addition & 0 deletions cli/internal/cmd/cloud_test.go
View file
Open in desktop
Expand Up @@ -23,6 +23,7 @@ func TestMain(m *testing.M) {
goleak.VerifyTestMain(m,
// https://github.com/census-instrumentation/opencensus-go/issues/1262
goleak.IgnoreTopFunction("go.opencensus.io/stats/view.(*worker).start"),
goleak.IgnoreAnyFunction("github.com/bazelbuild/rules_go/go/tools/bzltestutil.RegisterTimeoutHandler.func1"),
)
}

Expand Down
2 changes: 1 addition & 1 deletion cli/internal/terraform/terraform_test.go
View file
Open in desktop
Expand Up @@ -30,7 +30,7 @@ import (
)

func TestMain(m *testing.M) {
goleak.VerifyTestMain(m)
goleak.VerifyTestMain(m, goleak.IgnoreAnyFunction("github.com/bazelbuild/rules_go/go/tools/bzltestutil.RegisterTimeoutHandler.func1"))
}

func TestPrepareCluster(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion csi/cryptmapper/cryptmapper_test.go
View file
Open in desktop
Expand Up @@ -18,7 +18,7 @@ import (
)

func TestMain(m *testing.M) {
goleak.VerifyTestMain(m)
goleak.VerifyTestMain(m, goleak.IgnoreAnyFunction("github.com/bazelbuild/rules_go/go/tools/bzltestutil.RegisterTimeoutHandler.func1"))
}

func TestCloseCryptDevice(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion csi/kms/constellation_test.go
View file
Open in desktop
Expand Up @@ -19,7 +19,7 @@ import (
)

func TestMain(m *testing.M) {
goleak.VerifyTestMain(m)
goleak.VerifyTestMain(m, goleak.IgnoreAnyFunction("github.com/bazelbuild/rules_go/go/tools/bzltestutil.RegisterTimeoutHandler.func1"))
}

type stubKMSClient struct {
Expand Down
2 changes: 1 addition & 1 deletion csi/test/mount_integration_test.go
View file
Open in desktop
Expand Up @@ -91,7 +91,7 @@ func TestMain(m *testing.M) {
os.Exit(1)
}

goleak.VerifyTestMain(m)
goleak.VerifyTestMain(m, goleak.IgnoreAnyFunction("github.com/bazelbuild/rules_go/go/tools/bzltestutil.RegisterTimeoutHandler.func1"))

result := m.Run()
os.Exit(result)
Expand Down
1 change: 1 addition & 0 deletions debugd/internal/debugd/deploy/download_test.go
View file
Open in desktop
Expand Up @@ -27,6 +27,7 @@ func TestMain(m *testing.M) {
goleak.VerifyTestMain(m,
// https://github.com/census-instrumentation/opencensus-go/issues/1262
goleak.IgnoreTopFunction("go.opencensus.io/stats/view.(*worker).start"),
goleak.IgnoreAnyFunction("github.com/bazelbuild/rules_go/go/tools/bzltestutil.RegisterTimeoutHandler.func1"),
)
}

Expand Down
1 change: 1 addition & 0 deletions debugd/internal/debugd/metadata/cloudprovider/cloudprovider_test.go
View file
Open in desktop
Expand Up @@ -22,6 +22,7 @@ func TestMain(m *testing.M) {
goleak.VerifyTestMain(m,
// https://github.com/census-instrumentation/opencensus-go/issues/1262
goleak.IgnoreTopFunction("go.opencensus.io/stats/view.(*worker).start"),
goleak.IgnoreAnyFunction("github.com/bazelbuild/rules_go/go/tools/bzltestutil.RegisterTimeoutHandler.func1"),
)
}

Expand Down
2 changes: 1 addition & 1 deletion debugd/internal/debugd/metadata/fallback/fallback_test.go
View file
Open in desktop
Expand Up @@ -16,7 +16,7 @@ import (
)

func TestMain(m *testing.M) {
goleak.VerifyTestMain(m)
goleak.VerifyTestMain(m, goleak.IgnoreAnyFunction("github.com/bazelbuild/rules_go/go/tools/bzltestutil.RegisterTimeoutHandler.func1"))
}

func TestDiscoverDebugdIPs(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion debugd/internal/debugd/metadata/scheduler_test.go
View file
Open in desktop
Expand Up @@ -19,7 +19,7 @@ import (
)

func TestMain(m *testing.M) {
goleak.VerifyTestMain(m)
goleak.VerifyTestMain(m, goleak.IgnoreAnyFunction("github.com/bazelbuild/rules_go/go/tools/bzltestutil.RegisterTimeoutHandler.func1"))
}

func TestSchedulerStart(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion debugd/internal/debugd/server/server_test.go
View file
Open in desktop
Expand Up @@ -29,7 +29,7 @@ import (
)

func TestMain(m *testing.M) {
goleak.VerifyTestMain(m)
goleak.VerifyTestMain(m, goleak.IgnoreAnyFunction("github.com/bazelbuild/rules_go/go/tools/bzltestutil.RegisterTimeoutHandler.func1"))
}

func TestSetInfo(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion debugd/internal/filetransfer/filetransfer_test.go
View file
Open in desktop
Expand Up @@ -20,7 +20,7 @@ import (
)

func TestMain(m *testing.M) {
goleak.VerifyTestMain(m)
goleak.VerifyTestMain(m, goleak.IgnoreAnyFunction("github.com/bazelbuild/rules_go/go/tools/bzltestutil.RegisterTimeoutHandler.func1"))
}

func TestSendFiles(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion debugd/internal/filetransfer/streamer/streamer_test.go
View file
Open in desktop
Expand Up @@ -19,7 +19,7 @@ import (
)

func TestMain(m *testing.M) {
goleak.VerifyTestMain(m)
goleak.VerifyTestMain(m, goleak.IgnoreAnyFunction("github.com/bazelbuild/rules_go/go/tools/bzltestutil.RegisterTimeoutHandler.func1"))
}

func TestWriteStream(t *testing.T) {
Expand Down
1 change: 1 addition & 0 deletions disk-mapper/internal/recoveryserver/recoveryserver_test.go
View file
Open in desktop
Expand Up @@ -29,6 +29,7 @@ func TestMain(m *testing.M) {
goleak.VerifyTestMain(m,
// https://github.com/census-instrumentation/opencensus-go/issues/1262
goleak.IgnoreTopFunction("go.opencensus.io/stats/view.(*worker).start"),
goleak.IgnoreAnyFunction("github.com/bazelbuild/rules_go/go/tools/bzltestutil.RegisterTimeoutHandler.func1"),
)
}

Expand Down
2 changes: 1 addition & 1 deletion disk-mapper/internal/rejoinclient/rejoinclient_test.go
View file
Open in desktop
Expand Up @@ -30,7 +30,7 @@ import (
)

func TestMain(m *testing.M) {
goleak.VerifyTestMain(m)
goleak.VerifyTestMain(m, goleak.IgnoreAnyFunction("github.com/bazelbuild/rules_go/go/tools/bzltestutil.RegisterTimeoutHandler.func1"))
}

func TestStartCancel(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion disk-mapper/internal/setup/setup_test.go
View file
Open in desktop
Expand Up @@ -28,7 +28,7 @@ import (
)

func TestMain(m *testing.M) {
goleak.VerifyTestMain(m)
goleak.VerifyTestMain(m, goleak.IgnoreAnyFunction("github.com/bazelbuild/rules_go/go/tools/bzltestutil.RegisterTimeoutHandler.func1"))
}

func TestPrepareExistingDisk(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion disk-mapper/internal/systemd/systemd_test.go
View file
Open in desktop
Expand Up @@ -14,7 +14,7 @@ import (
)

func TestMain(m *testing.M) {
goleak.VerifyTestMain(m)
goleak.VerifyTestMain(m, goleak.IgnoreAnyFunction("github.com/bazelbuild/rules_go/go/tools/bzltestutil.RegisterTimeoutHandler.func1"))
}

func TestConfigureUnit(t *testing.T) {
Expand Down
1 change: 1 addition & 0 deletions disk-mapper/internal/test/integration_test.go
View file
Open in desktop
Expand Up @@ -87,6 +87,7 @@ func TestMain(m *testing.M) {
goleak.VerifyTestMain(m,
// https://github.com/census-instrumentation/opencensus-go/issues/1262
goleak.IgnoreTopFunction("go.opencensus.io/stats/view.(*worker).start"),
goleak.IgnoreAnyFunction("github.com/bazelbuild/rules_go/go/tools/bzltestutil.RegisterTimeoutHandler.func1"),
)

result := m.Run()
Expand Down
12 changes: 6 additions & 6 deletions flake.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions go.work
View file
Open in desktop
@@ -1,6 +1,6 @@
go 1.21.1
go 1.21.6

toolchain go1.21.5
toolchain go1.21.6

use (
.
Expand Down
2 changes: 1 addition & 1 deletion hack/bazel-deps-mirror/internal/bazelfiles/files_test.go
View file
Open in desktop
Expand Up @@ -18,7 +18,7 @@ import (
)

func TestMain(m *testing.M) {
goleak.VerifyTestMain(m)
goleak.VerifyTestMain(m, goleak.IgnoreAnyFunction("github.com/bazelbuild/rules_go/go/tools/bzltestutil.RegisterTimeoutHandler.func1"))
}

func TestFindFiles(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion hack/bazel-deps-mirror/internal/issues/issues_test.go
View file
Open in desktop
Expand Up @@ -16,7 +16,7 @@ import (
)

func TestMain(m *testing.M) {
goleak.VerifyTestMain(m)
goleak.VerifyTestMain(m, goleak.IgnoreAnyFunction("github.com/bazelbuild/rules_go/go/tools/bzltestutil.RegisterTimeoutHandler.func1"))
}

func TestMap(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion hack/bazel-deps-mirror/internal/mirror/mirror_test.go
View file
Open in desktop
Expand Up @@ -24,7 +24,7 @@ import (
)

func TestMain(m *testing.M) {
goleak.VerifyTestMain(m)
goleak.VerifyTestMain(m, goleak.IgnoreAnyFunction("github.com/bazelbuild/rules_go/go/tools/bzltestutil.RegisterTimeoutHandler.func1"))
}

func TestMirrorURL(t *testing.T) {
Expand Down