Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

move git diff checks on dev builds #597

Merged
merged 2 commits into from Dec 14, 2016
Merged

move git diff checks on dev builds #597

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4b83356
ceph-dev-new-setup: move the git diff check before calling autogen.sh
Dec 14, 2016
d4f4034
ceph-dev-setup: move the git diff check before calling autogen.sh
Dec 14, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
33 changes: 19 additions & 14 deletions ceph-dev-new-setup/build/build
View file
Open in desktop
Expand Up @@ -63,6 +63,25 @@ else
export CEPH_EXTRA_CMAKE_ARGS="$CEPH_EXTRA_CMAKE_ARGS -DALLOCATOR=tcmalloc"
fi

# When using autotools/autoconf it is possible to see output from `git diff`
# since some macros can be copied over to the ceph source, triggering this
# check. This is why this check now is done just before running autogen.sh
# which calls `aclocal -I m4 --install` that copies a system version of
# ltsugar.m4 that can be different from the one included in the ceph source
# tree.
if git diff --quiet ; then
echo repository is clean
else
echo
echo "**** REPOSITORY IS DIRTY ****"
echo
git diff
if [ "$force" != "force" ]; then
echo "add 'force' argument if you really want to continue."
exit 1
fi
echo "forcing."
fi

# make-dist does not exist for autotools builds
if [ ! -x make-dist ]; then
Expand Down Expand Up @@ -98,20 +117,6 @@ mkdir -p release
releasedir='release'
versionfile='release/version'

if git diff --quiet ; then
echo repository is clean
else
echo
echo "**** REPOSITORY IS DIRTY ****"
echo
git diff
if [ "$force" != "force" ]; then
echo "add 'force' argument if you really want to continue."
exit 1
fi
echo "forcing."
fi

cephver=`git describe --match "v*" | sed s/^v//`
echo current version $cephver

Expand Down
33 changes: 19 additions & 14 deletions ceph-dev-setup/build/build
View file
Open in desktop
Expand Up @@ -58,6 +58,25 @@ else
export CEPH_EXTRA_CMAKE_ARGS="$CEPH_EXTRA_CMAKE_ARGS -DALLOCATOR=tcmalloc"
fi

# When using autotools/autoconf it is possible to see output from `git diff`
# since some macros can be copied over to the ceph source, triggering this
# check. This is why this check now is done just before running autogen.sh
# which calls `aclocal -I m4 --install` that copies a system version of
# ltsugar.m4 that can be different from the one included in the ceph source
# tree.
if git diff --quiet ; then
echo repository is clean
else
echo
echo "**** REPOSITORY IS DIRTY ****"
echo
git diff
if [ "$force" != "force" ]; then
echo "add 'force' argument if you really want to continue."
exit 1
fi
echo "forcing."
fi

# make-dist does not exist for autotools builds
if [ ! -x make-dist ]; then
Expand Down Expand Up @@ -93,20 +112,6 @@ mkdir -p release
releasedir='release'
versionfile='release/version'

if git diff --quiet ; then
echo repository is clean
else
echo
echo "**** REPOSITORY IS DIRTY ****"
echo
git diff
if [ "$force" != "force" ]; then
echo "add 'force' argument if you really want to continue."
exit 1
fi
echo "forcing."
fi

cephver=`git describe --match "v*" | sed s/^v//`
echo current version $cephver

Expand Down