mirror of
git://source.winehq.org/git/wine.git
synced 2024-10-06 09:17:14 +00:00
gitlab: Always reset the git tree after a build.
This commit is contained in:
parent
1d0f66a3c6
commit
97302f7c9e
|
@ -19,10 +19,10 @@ cd build32
|
|||
make -s -j$(nproc)
|
||||
cd ..
|
||||
|
||||
if test -s .git/rebase-merge/git-rebase-todo
|
||||
if ! test -s .git/rebase-merge/git-rebase-todo
|
||||
then
|
||||
git reset --hard
|
||||
else
|
||||
make -s -j$(nproc) -C build32 install-lib install-test DESTDIR=$BASEDIR
|
||||
make -s -j$(nproc) -C build64 install-lib install-test DESTDIR=$BASEDIR
|
||||
fi
|
||||
|
||||
git reset --hard
|
||||
|
|
Loading…
Reference in a new issue