Jelajahi Sumber

Merge pull request #38677 from tiborvass/fix-validate

hack: no need to git fetch in CI
Tianon Gravi 6 tahun lalu
induk
melakukan
6800954050
2 mengubah file dengan 7 tambahan dan 2 penghapusan
  1. 2 0
      Makefile
  2. 5 2
      hack/validate/.validate

+ 2 - 0
Makefile

@@ -15,6 +15,7 @@ export DOCKER_GITCOMMIT
 # against these are used in hack/validate/.validate to check what changed in the PR.
 export VALIDATE_REPO
 export VALIDATE_BRANCH
+export VALIDATE_ORIGIN_BRANCH
 
 # env vars passed through directly to Docker's build scripts
 # to allow things like `make KEEPBUNDLE=1 binary` easily
@@ -54,6 +55,7 @@ DOCKER_ENVS := \
 	-e TIMEOUT \
 	-e VALIDATE_REPO \
 	-e VALIDATE_BRANCH \
+	-e VALIDATE_ORIGIN_BRANCH \
 	-e HTTP_PROXY \
 	-e HTTPS_PROXY \
 	-e NO_PROXY \

+ 5 - 2
hack/validate/.validate

@@ -11,8 +11,11 @@ if [ -z "$VALIDATE_UPSTREAM" ]; then
 
 	VALIDATE_HEAD="$(git rev-parse --verify HEAD)"
 
-	git fetch -q "$VALIDATE_REPO" "refs/heads/$VALIDATE_BRANCH"
-	VALIDATE_UPSTREAM="$(git rev-parse --verify FETCH_HEAD)"
+	if [ -z "$VALIDATE_ORIGIN_BRANCH" ]; then
+		git fetch -q "$VALIDATE_REPO" "refs/heads/$VALIDATE_BRANCH"
+		VALIDATE_ORIGIN_BRANCH=FETCH_HEAD
+	fi
+	VALIDATE_UPSTREAM="$(git rev-parse --verify $VALIDATE_ORIGIN_BRANCH)"
 
 	VALIDATE_COMMIT_LOG="$VALIDATE_UPSTREAM..$VALIDATE_HEAD"
 	VALIDATE_COMMIT_DIFF="$VALIDATE_UPSTREAM...$VALIDATE_HEAD"