Module: wine Branch: master Commit: 97302f7c9ea68e2cb28b31c6718a8459bdd0875d URL: https://gitlab.winehq.org/wine/wine/-/commit/97302f7c9ea68e2cb28b31c6718a845...
Author: Alexandre Julliard julliard@winehq.org Date: Fri Sep 9 12:36:00 2022 +0200
gitlab: Always reset the git tree after a build.
---
tools/gitlab/build-linux | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/tools/gitlab/build-linux b/tools/gitlab/build-linux index 6170a66e792..659ff0a0c17 100755 --- a/tools/gitlab/build-linux +++ b/tools/gitlab/build-linux @@ -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