Alexandre Julliard : winetest: Wait for head commit to stabilize before building test binaries.
Alexandre Julliard
julliard at winehq.org
Wed Jun 15 15:31:50 CDT 2022
Module: tools
Branch: master
Commit: d98b57601dcba3c7eb571e9eb0262e5c3d97ef6f
URL: https://source.winehq.org/git/tools.git/?a=commit;h=d98b57601dcba3c7eb571e9eb0262e5c3d97ef6f
Author: Alexandre Julliard <julliard at winehq.org>
Date: Wed Jun 15 12:20:07 2022 +0200
winetest: Wait for head commit to stabilize before building test binaries.
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
winetest/make-winetest | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/winetest/make-winetest b/winetest/make-winetest
index 370698ac..a16b06ba 100755
--- a/winetest/make-winetest
+++ b/winetest/make-winetest
@@ -47,8 +47,6 @@ done
destdir="/home/winehq/opt/winetest/builds"
desturl="http://test.winehq.org/builds"
servicedir="/home/winehq/opt/winetest/winehq-builds/winetest"
-toolsdir="/home/winehq/opt/tools"
-transldir="/home/winehq/opt/source/transl"
logfile=LOG
@@ -64,13 +62,15 @@ umask 022
set -e
(cd wine && git pull) || exit
head=$(cd wine && git rev-parse --short=12 HEAD) || exit
- branch=$(cd wine && git symbolic-ref HEAD) || exit
- if [ $branch != refs/heads/master ]
+ if [ -f $destdir/winetest-$head.exe -a -f $destdir/winetest64-$head.exe -a $force -eq 0 ]
then
exit 0
fi
- if [ -f $destdir/winetest-$head.exe -a -f $destdir/winetest64-$head.exe -a $force -eq 0 ]
+
+ prev_head=$(cd wine && git rev-parse --short=12 PREV-HEAD)
+ (cd wine && git tag -f PREV-HEAD $head)
+ if [ "$head" != "$prev_head" -a $force -eq 0 ]
then
exit 0
fi
More information about the wine-cvs
mailing list