InTheForest/moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2026-01-11 18:51:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #51750 from vvoland/fix-validate-module-replace2

Browse Source 
validate/module-replace: Also allow changing ref of the api module
This commit is contained in:
Paweł Gronowski
2025-12-18 20:08:14 +00:00
committed by GitHub
parent 1145b1def1 9dd2936e04
commit 05bbf3768b
1 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
hack/validate/module-replace
View File

@@ -28,7 +28,8 @@ echo "go.mod:"
cat go.mod cat go.mod
echo "================================================" echo "================================================"
# reads stdin and returns 1 or 0 if the replace rule for the module is present # reads stdin and returns 1 or 0 if it only contains changes related to the
# provided module
# example input: # example input:
# - github.com/moby/moby/api v1.52.0 # - github.com/moby/moby/api v1.52.0
# + github.com/moby/moby/api v1.52.1-0.20251217102041-b8093b76fb43 # + github.com/moby/moby/api v1.52.1-0.20251217102041-b8093b76fb43
@@ -36,14 +37,10 @@ echo "================================================"
# -replace github.com/moby/moby/api => ../api # -replace github.com/moby/moby/api => ../api
# +github.com/moby/moby/api v1.52.1-0.20251217102041-b8093b76fb43 h1:CTVB9ByfoOULdpH0GiDWwHK3B1jxwjoWtHiEGia1nRc= # +github.com/moby/moby/api v1.52.1-0.20251217102041-b8093b76fb43 h1:CTVB9ByfoOULdpH0GiDWwHK3B1jxwjoWtHiEGia1nRc=
# +github.com/moby/moby/api v1.52.1-0.20251217102041-b8093b76fb43/go.mod h1:8mb+ReTlisw4pS6BRzCMts5M49W5M7bKt1cJy/YbAqc= # +github.com/moby/moby/api v1.52.1-0.20251217102041-b8093b76fb43/go.mod h1:8mb+ReTlisw4pS6BRzCMts5M49W5M7bKt1cJy/YbAqc=
only_removes_replace_rule_for_module() { only_changes_module() {
local module="$1" local module="$1"
input=$(cat | sed '/^[-+]$/d') # strip empty lines input=$(cat | sed '/^[-+]$/d') # strip empty lines
if ! grep -qE "^-replace ${module} => " <<< "${input}"; then
return 1
fi
# Check if ALL lines contain the module string # Check if ALL lines contain the module string
# The grep command checks if there's NO match for the module string, and # The grep command checks if there's NO match for the module string, and
# then we negate the results # then we negate the results
@@ -77,8 +74,8 @@ echo >&2 "================================================"
# Check if changes to ./client require a replace rule in go.mod # Check if changes to ./client require a replace rule in go.mod
if [ -n "${TEST_FORCE_VALIDATE:-}" ] || [ -n "${client_diff}" ]; then if [ -n "${TEST_FORCE_VALIDATE:-}" ] || [ -n "${client_diff}" ]; then
echo "Detected changes in ./client directory, checking for replace rule..." echo "Detected changes in ./client directory, checking for replace rule..."
if only_removes_replace_rule_for_module "github.com/moby/moby/api" <<< "${client_diff}"; then if only_changes_module "github.com/moby/moby/api" <<< "${client_diff}"; then
echo >&2 "✓ This seems to only remove the replace rule for github.com/moby/moby/api" echo >&2 "✓ This seems to only change the module github.com/moby/moby/api revision"
elif ! go list -mod=readonly -m -json github.com/moby/moby/client | jq -e '.Replace'; then elif ! go list -mod=readonly -m -json github.com/moby/moby/client | jq -e '.Replace'; then
echo >&2 "ERROR: Changes detected in ./client but go.mod is missing a replace rule for github.com/moby/moby/client" echo >&2 "ERROR: Changes detected in ./client but go.mod is missing a replace rule for github.com/moby/moby/client"
echo >&2 "Please run ./hack/vendor.sh replace" echo >&2 "Please run ./hack/vendor.sh replace"