From 3cbea534fbae9e70b6257e986aa70be5ad526603 Mon Sep 17 00:00:00 2001
From: Michael Soegtrop
Date: Thu, 13 Sep 2018 16:59:15 +0200
Subject: Merge commit 6a8c37c02504463afaa677641d75d9977020edf6 Windows
 buildfile cleanup and stability and logging enhancements from v8.8

---
 dev/ci/gitlab.bat | 34 ++++++++++++++++++++++++++++++++--
 1 file changed, 32 insertions(+), 2 deletions(-)
 mode change 100644 => 100755 dev/ci/gitlab.bat

(limited to 'dev/ci/gitlab.bat')

diff --git a/dev/ci/gitlab.bat b/dev/ci/gitlab.bat
old mode 100644
new mode 100755
index 973319de68..6eda25170a
--- a/dev/ci/gitlab.bat
+++ b/dev/ci/gitlab.bat
@@ -1,5 +1,8 @@
 @ECHO OFF
 
+ECHO "Start Time"
+TIME /T
+
 REM This script builds and signs the Windows packages on Gitlab
 
 if %ARCH% == 32 (
@@ -29,10 +32,23 @@ call %CI_PROJECT_DIR%\dev\build\windows\MakeCoq_MinGW.bat -threads=1 ^
   -arch=%ARCH% -installer=Y -coqver=%CI_PROJECT_DIR_CFMT% ^
   -destcyg=%CYGROOT% -destcoq=%DESTCOQ% -cygcache=%CYGCACHE% ^
   -addon="bignums ltac2 equations" -make=N ^
-  -setup %CI_PROJECT_DIR%\%SETUP% || GOTO ErrorExit
+  -setup %CI_PROJECT_DIR%\%SETUP% || GOTO ErrorZipLogfilesAndExit
+
+
+ECHO "Start Artifact Creation"
+TIME /T
+
+CALL :ZipLogfiles
 
 copy "%CYGROOT%\build\coq-local\dev\nsis\*.exe" dev\nsis || GOTO ErrorExit
-7z a coq-opensource-archive-windows-%ARCHLONG%.zip %CYGROOT%\build\tarballs\* || GOTO ErrorExit
+REM The open source archive is only required for release builds
+IF DEFINED WIN_CERTIFICATE_PATH (
+  7z a coq-opensource-archive-windows-%ARCHLONG%.zip %CYGROOT%\build\tarballs\* || GOTO ErrorExit
+) ELSE (
+  REM In non release builds, create a dummy file
+  ECHO "This is not a release build - open source archive not created / uploaded" > coq-opensource-info.txt
+  7z a coq-opensource-archive-windows-%ARCHLONG%.zip coq-opensource-info.txt || GOTO ErrorExit
+)
 
 REM DO NOT echo the signing command below, as this would leak secrets in the logs
 IF DEFINED WIN_CERTIFICATE_PATH (
@@ -43,8 +59,22 @@ IF DEFINED WIN_CERTIFICATE_PATH (
   )
 )
 
+ECHO "Finished Artifact Creation"
+TIME /T
+
 GOTO :EOF
 
+:ZipLogfiles
+  ECHO Zipping logfiles for artifact upload
+  7z a coq-buildlogs.zip %CYGROOT%\build\buildlogs\*
+  7z a coq-filelists.zip %CYGROOT%\build\filelists\*
+  7z a coq-flagfiles.zip %CYGROOT%\build\flagfiles\*
+  GOTO :EOF
+
+:ErrorZipLogfilesAndExit
+  CALL :ZipLogfiles
+  REM fall through
+
 :ErrorExit
   ECHO ERROR %0 failed
   EXIT /b 1
-- 
cgit v1.2.3