Skip to content

W
wine-winehq
Commit 97302f7c authored by Alexandre Julliard's avatar Alexandre Julliard
Browse files
Options

gitlab: Always reset the git tree after a build.

parent 1d0f66a3
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
tools/gitlab/build-linux
View file @ 97302f7c
...@@ -19,10 +19,10 @@ cd build32 ...@@ -19,10 +19,10 @@ cd build32
make -s -j$(nproc) make -s -j$(nproc)
cd .. cd ..
if test -s .git/rebase-merge/git-rebase-todo if ! test -s .git/rebase-merge/git-rebase-todo
then then
git reset --hard
else
make -s -j$(nproc) -C build32 install-lib install-test DESTDIR=$BASEDIR make -s -j$(nproc) -C build32 install-lib install-test DESTDIR=$BASEDIR
make -s -j$(nproc) -C build64 install-lib install-test DESTDIR=$BASEDIR make -s -j$(nproc) -C build64 install-lib install-test DESTDIR=$BASEDIR
fi fi
git reset --hard
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment