Skip to content

Commit

Permalink
bazel: rewrite pseudo-version stamping in bash (#2020)
Browse files Browse the repository at this point in the history
* bazel: simplify workspace_status command to only depend on bash and git
* bazel: remove pseudo-version freshness code
  • Loading branch information
malt3 authored Jul 5, 2023
1 parent 149820f commit 46d69ab
Show file tree
Hide file tree
Showing 14 changed files with 26 additions and 344 deletions.
24 changes: 0 additions & 24 deletions .github/workflows/pseudo-version-freshness.yml

This file was deleted.

1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,6 @@ __pycache__/

# Bazel
/bazel-*
tools/pseudo-version
.bazeloverwriterc

# bazeldnf
Expand Down
6 changes: 0 additions & 6 deletions bazel/ci/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -461,7 +461,6 @@ multirun(
":govulncheck",
":deps_mirror_check",
":proto_targets_check",
"//hack/pseudo-version:pseudo_version_tool_freshness",
] + select({
"@io_bazel_rules_go//go/platform:darwin_arm64": [
":shellcheck_noop_warning",
Expand Down Expand Up @@ -489,8 +488,3 @@ multirun(
jobs = 0, # execute concurrently
visibility = ["//visibility:public"],
)

repo_command(
name = "pseudo_version_tool_freshness",
command = "//hack/pseudo-version/check",
)
2 changes: 0 additions & 2 deletions hack/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,10 @@ replace (
)

require (
github.com/aws/aws-sdk-go v1.44.257
github.com/aws/aws-sdk-go-v2/config v1.18.27
github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.11.71
github.com/aws/aws-sdk-go-v2/service/s3 v1.36.0
github.com/bazelbuild/buildtools v0.0.0-20230317132445-9c3c1fc0106e
github.com/bazelbuild/rules_go v0.39.1
github.com/edgelesssys/constellation/v2 v2.6.0
github.com/go-git/go-git/v5 v5.6.1
github.com/hexops/gotextdiff v1.0.3
Expand Down
4 changes: 0 additions & 4 deletions hack/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -214,8 +214,6 @@ github.com/aws/aws-sdk-go v1.25.11/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpi
github.com/aws/aws-sdk-go v1.25.37/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo=
github.com/aws/aws-sdk-go v1.27.0/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo=
github.com/aws/aws-sdk-go v1.37.0/go.mod h1:hcU610XS61/+aQV88ixoOzUoG7v3b31pl2zKMmprdro=
github.com/aws/aws-sdk-go v1.44.257 h1:HwelXYZZ8c34uFFhgVw3ybu2gB5fkk8KLj2idTvzZb8=
github.com/aws/aws-sdk-go v1.44.257/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI=
github.com/aws/aws-sdk-go-v2 v0.18.0/go.mod h1:JWVYvqSMppoMJC0x5wdwiImzgXTI9FuZwxzkQq9wy+g=
github.com/aws/aws-sdk-go-v2 v1.18.1 h1:+tefE750oAb7ZQGzla6bLkOwfcQCEtC5y2RqoqCeqKo=
github.com/aws/aws-sdk-go-v2 v1.18.1/go.mod h1:uzbQtefpm44goOPmdKyAlXSNcwlRgF3ePWVW6EtJvvw=
Expand Down Expand Up @@ -262,8 +260,6 @@ github.com/aws/smithy-go v1.13.5/go.mod h1:Tg+OJXh4MB2R/uN61Ko2f6hTZwB/ZYGOtib8J
github.com/aybabtme/rgbterm v0.0.0-20170906152045-cc83f3b3ce59/go.mod h1:q/89r3U2H7sSsE2t6Kca0lfwTK8JdoNGS/yzM/4iH5I=
github.com/bazelbuild/buildtools v0.0.0-20230317132445-9c3c1fc0106e h1:XmPu4mXICgdGnC5dXGjUGbwUD/kUmS0l5Aop3LaevBM=
github.com/bazelbuild/buildtools v0.0.0-20230317132445-9c3c1fc0106e/go.mod h1:689QdV3hBP7Vo9dJMmzhoYIyo/9iMhEmHkJcnaPRCbo=
github.com/bazelbuild/rules_go v0.39.1 h1:wkJLUDx59dntWMghuL8++GteoU1To6sRoKJXuyFtmf8=
github.com/bazelbuild/rules_go v0.39.1/go.mod h1:TMHmtfpvyfsxaqfL9WnahCsXMWDMICTw7XeK9yVb+YU=
github.com/benbjohnson/clock v1.0.3/go.mod h1:bGMdMPoPVvcYyt1gHDf4J2KE153Yf9BuiUKYMaxlTDM=
github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA=
github.com/benbjohnson/clock v1.3.0 h1:ip6w0uFQkncKQ979AypyG0ER7mqUSBdKLOgAle/AT8A=
Expand Down
15 changes: 0 additions & 15 deletions hack/pseudo-version/BUILD.bazel
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_cross_binary", "go_library")
load("//bazel/sh:def.bzl", "sh_template")
load("//hack/pseudo-version:platforms.bzl", "platforms")

go_library(
Expand Down Expand Up @@ -33,17 +32,3 @@ go_binary(
)
for platform in platforms()
]

sh_template(
name = "pseudo_version_tool_freshness",
data = [
":pseudo_version_" + platform
for platform in platforms()
],
substitutions = {
"@@PSEUDO_VERSION_%s@@" % platform: "$(rootpath :pseudo_version_%s)" % platform
for platform in platforms()
},
template = "pseudo_version_tool_freshness.sh.in",
visibility = ["//visibility:public"],
)
27 changes: 0 additions & 27 deletions hack/pseudo-version/check/BUILD.bazel

This file was deleted.

176 changes: 0 additions & 176 deletions hack/pseudo-version/check/check.go

This file was deleted.

43 changes: 0 additions & 43 deletions hack/pseudo-version/pseudo_version_tool_freshness.sh.in

This file was deleted.

1 change: 0 additions & 1 deletion tools/pseudo_version_darwin_amd64.sha256

This file was deleted.

1 change: 0 additions & 1 deletion tools/pseudo_version_darwin_arm64.sha256

This file was deleted.

1 change: 0 additions & 1 deletion tools/pseudo_version_linux_amd64.sha256

This file was deleted.

1 change: 0 additions & 1 deletion tools/pseudo_version_linux_arm64.sha256

This file was deleted.

Loading

0 comments on commit 46d69ab

Please sign in to comment.