0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

hack: no need to git fetch in CI

Browse source 
CIs are assumed to do a git fetch and git merge before running tests.
Therefore, no need for a git fetch inside our validate scripts in CI.

If VALIDATE_ORIGIN_BRANCH is set, then git fetch is skipped and
VALIDATE_ORIGIN_BRANCH is used in validate scripts.

Otherwise, behavior is unchanged.

Signed-off-by: Tibor Vass <tibor@docker.com>
(cherry picked from commit feb70fd5c9)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Tibor Vass 2019-02-04 19:05:10 +00:00 • committed by Sebastiaan van Stijn
parent 748f37022d
commit 7b9ec00eec
No known key found for this signature in database
GPG key ID: 76698F39D527CE8C
2 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile
View file

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

5
hack/validate/.validate
View file

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