Skip to content

Commit

Permalink
Revert "build: bump go version to 1.23 (scionproto#4603)"
Browse files Browse the repository at this point in the history
This reverts commit 9e58974.
  • Loading branch information
lukedirtwalker committed Sep 3, 2024

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
1 parent ae5fb3b commit adead42
Showing 26 changed files with 241 additions and 107 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -120,7 +120,7 @@ GO_BUILD_TAGS_ARG=$(shell bazel info --ui_event_filters=-stdout,-stderr --announ
lint-go-golangci:
$(info ==> $@)
@if [ -t 1 ]; then tty=true; else tty=false; fi; \
tools/quiet docker run --tty=$$tty --rm -v golangci-lint-modcache:/go -v golangci-lint-buildcache:/root/.cache -v "${PWD}:/src" -w /src golangci/golangci-lint:v1.60.3 golangci-lint run --config=/src/.golangcilint.yml --timeout=3m $(GO_BUILD_TAGS_ARG) --skip-dirs doc ./...
tools/quiet docker run --tty=$$tty --rm -v golangci-lint-modcache:/go -v golangci-lint-buildcache:/root/.cache -v "${PWD}:/src" -w /src golangci/golangci-lint:v1.54.2 golangci-lint run --config=/src/.golangcilint.yml --timeout=3m $(GO_BUILD_TAGS_ARG) --skip-dirs doc ./...

lint-go-semgrep:
$(info ==> $@)
13 changes: 7 additions & 6 deletions WORKSPACE
Original file line number Diff line number Diff line change
@@ -46,20 +46,18 @@ aspect_bazel_lib_register_toolchains()
# Bazel rules for Golang
http_archive(
name = "io_bazel_rules_go",
sha256 = "af47f30e9cbd70ae34e49866e201b3f77069abb111183f2c0297e7e74ba6bbc0",
sha256 = "91585017debb61982f7054c9688857a2ad1fd823fc3f9cb05048b0025c47d023",
urls = [
"https://mirror.bazel.build/github.com/bazelbuild/rules_go/releases/download/v0.47.0/rules_go-v0.47.0.zip",
"https://github.com/bazelbuild/rules_go/releases/download/v0.47.0/rules_go-v0.47.0.zip",
"https://mirror.bazel.build/github.com/bazelbuild/rules_go/releases/download/v0.42.0/rules_go-v0.42.0.zip",
"https://github.com/bazelbuild/rules_go/releases/download/v0.42.0/rules_go-v0.42.0.zip",
],
)

load("@io_bazel_rules_go//go:deps.bzl", "go_register_toolchains", "go_rules_dependencies")

go_rules_dependencies()

go_register_toolchains(
nogo = "@//:nogo",
version = "1.23.0",
version = "1.21.10",
)

# Gazelle
@@ -73,6 +71,9 @@ http_archive(
)

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

go_rules_dependencies()

load("//:tool_deps.bzl", "tool_deps")

tool_deps()
2 changes: 1 addition & 1 deletion dist/package.bzl
Original file line number Diff line number Diff line change
@@ -77,7 +77,7 @@ def scion_pkg_deb(name, executables = {}, systemds = [], configs = [], **kwargs)
"@platforms//cpu:x86_64": "amd64",
"@platforms//cpu:x86_32": "i386",
"@platforms//cpu:aarch64": "arm64",
"@platforms//cpu:armv7": "armel",
"@platforms//cpu:arm": "armel",
"@platforms//cpu:s390x": "s390x",
# Note: some rules_go toolchains don't (currently) seem to map (cleanly) to @platforms//cpu.
# "@platforms//cpu:ppc": "ppc64",
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -128,4 +128,4 @@ require (
modernc.org/token v1.1.0 // indirect
)

go 1.23.0
go 1.21.10

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

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

27 changes: 0 additions & 27 deletions licenses/data/go_sdk/src/cmd/vendor/golang.org/x/telemetry/LICENSE

This file was deleted.

27 changes: 0 additions & 27 deletions licenses/data/go_sdk/src/cmd/vendor/golang.org/x/text/LICENSE

This file was deleted.

27 changes: 0 additions & 27 deletions licenses/data/go_sdk/src/cmd/vendor/rsc.io/markdown/LICENSE

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Copyright (c) 2009 The Go Authors. All rights reserved.
Copyright (c) 2017 The Go Authors. All rights reserved.

Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are
2 changes: 1 addition & 1 deletion pkg/proto/control_plane/cppki.pb.go

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

2 changes: 1 addition & 1 deletion pkg/proto/control_plane/drkey.pb.go

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

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

Loading

0 comments on commit adead42

Please sign in to comment.