From d5b8a6130e28a04a6cdf5ab4a76b05b40cee9b6f Mon Sep 17 00:00:00 2001 From: Stephan Renatus Date: Fri, 1 Jul 2022 14:19:43 +0200 Subject: [PATCH] release process: fix metadata logic (#4836) We got 0.42.0 twice when version/version.go already was "0.42.0". Signed-off-by: Stephan Renatus --- build/check-working-copy.sh | 2 ++ internal/cmd/genbuiltinmetadata/main.go | 4 ---- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/build/check-working-copy.sh b/build/check-working-copy.sh index 85bb7cd6e2..cb5c48c8a7 100755 --- a/build/check-working-copy.sh +++ b/build/check-working-copy.sh @@ -26,5 +26,7 @@ if [[ "${HAS_CHANGES}" == "1" ]]; then echo "" echo "git status" git status + echo "git diff" + git diff exit 1 fi diff --git a/internal/cmd/genbuiltinmetadata/main.go b/internal/cmd/genbuiltinmetadata/main.go index c3b2bbb46d..2f81840eb7 100644 --- a/internal/cmd/genbuiltinmetadata/main.go +++ b/internal/cmd/genbuiltinmetadata/main.go @@ -13,15 +13,11 @@ import ( "github.com/open-policy-agent/opa/ast" "github.com/open-policy-agent/opa/internal/compiler/wasm" "github.com/open-policy-agent/opa/types" - "github.com/open-policy-agent/opa/version" ) func main() { f := ast.CapabilitiesForThisVersion() sorted := sortedCaps() - if !strings.HasSuffix(version.Version, "-dev") { - sorted = append(sorted, versionedCaps{version: "v" + version.Version, caps: f}) - } sorted = append(sorted, versionedCaps{version: "edge", caps: f}) mdata := make(map[string]interface{})