diff --git a/README.md b/README.md index 4a4e5689..83e1fc87 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,7 @@ # [csi-release-tools](https://github.com/kubernetes-csi/csi-release-tools) +Test.... + These build and test rules can be shared between different Go projects without modifications. Customization for the different projects happen in the top-level Makefile. diff --git a/pull-test.sh b/pull-test.sh index b019c177..0fe151c6 100755 --- a/pull-test.sh +++ b/pull-test.sh @@ -20,12 +20,23 @@ set -ex +git version + # It must be called inside the updated csi-release-tools repo. CSI_RELEASE_TOOLS_DIR="$(pwd)" # Update the other repo. cd "$PULL_TEST_REPO_DIR" -git subtree pull --squash --prefix=release-tools "$CSI_RELEASE_TOOLS_DIR" master +git reset --hard # Shouldn't be necessary, but somehow is to avoid "fatal: working tree has modifications. Cannot add." (https://stackoverflow.com/questions/3623351/git-subtree-pull-says-that-the-working-tree-has-modifications-but-git-status-sa) +if ! git subtree pull --squash --prefix=release-tools "$CSI_RELEASE_TOOLS_DIR" master; then + set +e + git status + git diff + git diff-index HEAD + git reset --hard + git diff-index HEAD + exit 1 +fi git log -n2 # Now fall through to testing.