Add v2/Makefile and call it for each rule

Author: thockin

Makefile

@@ -1,17 +1,16 @@
 all:
 	go build ./...
-	go -C v2 build ./...
+	make -C v2 all
 
 test:
 	go test -race ./...
-	go -C v2 test -race ./...
-	(cd v2 && ./hack/verify-examples.sh)
+	go -C ./examples/defaulter-gen/_output_tests test ./...
+	make -C v2 test
 
 # We verify for the maximum version of the go directive as 1.20
 # here because the oldest go directive that exists on our supported
 # release branches in k/k is 1.20.
 verify:
 	./hack/verify-examples.sh
 	./hack/verify-go-directive.sh 1.20
-	./v2/hack/verify-examples.sh
-	cd v2 && ../hack/verify-go-directive.sh 1.20
+	make -C v2 verify

hack/verify-examples.sh

@@ -32,10 +32,9 @@ find ./examples -name "zz_generated.go" -type f -delete
 find ./examples/set-gen/sets -maxdepth 1 -type f -not -name "set_test.go" -not -name "doc.go" -delete
 
 # Generate set-gen first since others depend on it
-echo "Generating example output..."
-go generate ./examples/set-gen/...
+echo "Generating example output"
 go generate ./examples/...
-pushd ./examples/defaulter-gen/_output_tests; go generate ./...; popd
+go -C ./examples/defaulter-gen/_output_tests generate ./...
 
 # If there are any differences with committed files, fail
 if ! git diff --quiet HEAD; then
@@ -44,7 +43,5 @@ if ! git diff --quiet HEAD; then
     exit 1
 fi
 
-echo "Running tests..."
-go test ./examples/...
+echo "Running import-boss"
 go run ./examples/import-boss/main.go -i $(go list k8s.io/gengo/... | grep -v import-boss/tests | paste -sd',' -) --verify-only
-pushd ./examples/defaulter-gen/_output_tests; go test ./...; popd

v2/Makefile

@@ -0,0 +1,12 @@
+all:
+	go build ./...
+
+test:
+	go test -race ./...
+
+# We verify for the maximum version of the go directive as 1.20
+# here because the oldest go directive that exists on our supported
+# release branches in k/k is 1.20.
+verify:
+	./hack/verify-examples.sh
+	./hack/verify-go-directive.sh 1.20

v2/hack/verify-examples.sh

@@ -18,9 +18,7 @@ if ! git diff --quiet HEAD; then
     exit 1
 fi
 
-echo "Running tests..."
-go test ./examples/...
-
+echo "Running ./examples/tracer"
 rm ./examples/tracer/testdata/simple/out.txt
 go run ./examples/tracer ./examples/tracer/testdata/simple > ./examples/tracer/testdata/simple/out.txt
 if ! git diff --quiet HEAD; then
@@ -29,6 +27,7 @@ if ! git diff --quiet HEAD; then
     exit 1
 fi
 
+echo "Running ./examples/kilroy"
 rm ./examples/kilroy/testdata/simple/generated.kilroy.go
 go run ./examples/kilroy/ ./examples/kilroy/testdata/simple
 if ! git diff --quiet HEAD; then
@@ -37,6 +36,7 @@ if ! git diff --quiet HEAD; then
     exit 1
 fi
 
+echo "Running ./examples/pointuh"
 rm -rf ./examples/pointuh/testdata/results
 go run ./examples/pointuh/ \
     --output-dir ./examples/pointuh/testdata/results \

v2/hack/verify-go-directive.sh

@@ -0,0 +1,57 @@
+#!/usr/bin/env bash
+
+# Copyright 2024 The Kubernetes Authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+set -o errexit
+set -o nounset
+set -o pipefail
+
+function usage {
+  local script="$(basename $0)"
+
+  echo >&2 "Usage: ${script} <maximum go directive>
+This script should be run at the root of a module.
+
+Compare the go directive in the local working copy's go.mod
+to the specified maximum version it can be. Versions provided
+here are of the form 1.x.y, without the 'go' prefix.
+Examples:
+  ${script} 1.20
+  ${script} 1.21.6
+"
+  exit 1
+}
+
+max="$1"
+# If max is empty, print usage and error
+if [[ -z "${max}" ]]; then
+  usage;
+fi
+
+# Don't specify the version with the go prefix, just 1.x.y will do.
+if [[ ! "${max}" =~ ^[0-9]\.[0-9]+(\.[0-9]+)?$ ]]; then
+    usage
+fi
+
+current=$(awk '/^go / {print $2;}' go.mod)
+if [[ -z "${current}" ]]; then
+  echo >&2 "FAIL: could not get value of go directive from go.mod"
+  exit 1
+fi
+
+if ! printf '%s\n' "${current}" "${max}" | sort --check=silent --version-sort; then
+    echo >&2 "FAIL: current Go directive ${current} is greater than ${max}"
+    exit 1
+fi