[gimp/wip/Jehan/gitlab-ci-win-32-bit] Test.




commit 0035134b9f1c8003022968621dbaf7a7a8e9fd2c
Author: Jehan <jehan girinstud io>
Date:   Fri May 14 03:31:46 2021 +0200

    Test.

 .gitlab-ci.yml                                  | 19 +++++++++++++++++++
 build/windows/gitlab-ci/installer-gimp-msys2.sh |  7 ++++---
 build/windows/gitlab-ci/test-innosetup-msys2.sh | 10 ++++++++--
 3 files changed, 31 insertions(+), 5 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b257d1c381..36ce181a28 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -13,6 +13,24 @@ variables:
   INSTALL_PREFIX: "${CI_PROJECT_DIR}/${INSTALL_DIR}"
   APT_CACHE: "${CI_PROJECT_DIR}/apt-cache"
 
+test-innosetup:
+  variables:
+    CHERE_INVOKING: "yes"
+  tags:
+    - win32-ps
+  stage: prepare
+  artifacts:
+    name: "${CI_JOB_NAME}-${CI_COMMIT_REF_SLUG}"
+    when: always
+    expire_in: 2 days
+    paths:
+    - build/windows/installer/_Output
+    - is.exe
+    - innosetup.log
+  script:
+    - C:\msys64\usr\bin\pacman --noconfirm -Syyuu
+    - C:\msys64\usr\bin\bash -lc "bash -x ./build/windows/gitlab-ci/test-innosetup-msys2.sh"
+
 ## prepare docker images ##
 
 build-image:
@@ -233,6 +251,7 @@ gimp-win64-native:
     expire_in: 1 day
     paths:
     - _install-w64
+    - build/windows/installer/lang/
     #- _build-w64
   cache:
     paths:
diff --git a/build/windows/gitlab-ci/installer-gimp-msys2.sh b/build/windows/gitlab-ci/installer-gimp-msys2.sh
index 0b71e13714..7f0a3b4d3d 100644
--- a/build/windows/gitlab-ci/installer-gimp-msys2.sh
+++ b/build/windows/gitlab-ci/installer-gimp-msys2.sh
@@ -1,11 +1,12 @@
 wget https://jrsoftware.org/download.php/is.exe
-./is.exe //VERYSILENT //SUPPRESSMSGBOXES //ALLUSERS //LOG="innosetup.log"
+#./is.exe //VERYSILENT //SUPPRESSMSGBOXES //ALLUSERS //LOG="innosetup.log"
+./is.exe //SILENT //SUPPRESSMSGBOXES //CURRENTUSER //SP- //LOG="innosetup.log"
 ISCCDIR=`grep "Dest filename:.*ISCC.exe" innosetup.log | sed 's/.*Dest filename: *\|ISCC.exe//g'`
 echo "Inno Setup installed in $ISCCDIR"
-ISCCDIR="`realpath $ISCCDIR`"
+ISCCDIR=`cygpath -u "$ISCCDIR"`
 echo "Inno Setup installed in $ISCCDIR"
 ls "$ISCCDIR"
-mkdir "${ISCCDIR}/Languages/Unofficial"
+mkdir -p "${ISCCDIR}/Languages/Unofficial"
 cd "${ISCCDIR}/Languages/Unofficial"
 wget https://raw.githubusercontent.com/jrsoftware/issrc/main/Files/Languages/Unofficial/Basque.isl
 wget https://raw.githubusercontent.com/jrsoftware/issrc/main/Files/Languages/Unofficial/ChineseSimplified.isl
diff --git a/build/windows/gitlab-ci/test-innosetup-msys2.sh b/build/windows/gitlab-ci/test-innosetup-msys2.sh
index ba83b45f4f..ac69060034 100644
--- a/build/windows/gitlab-ci/test-innosetup-msys2.sh
+++ b/build/windows/gitlab-ci/test-innosetup-msys2.sh
@@ -1,4 +1,10 @@
 wget https://jrsoftware.org/download.php/is.exe
 ./is.exe //SILENT //SUPPRESSMSGBOXES //CURRENTUSER //SP- //LOG="innosetup.log"
-cd build/windows/installer
-./compile.bat 2.99.6 ../../.. gimp-w32 gimp-w64 ../../.. gimp-w32 gimp-w64
+ISCCDIR=`grep "Dest filename:.*ISCC.exe" innosetup.log | sed 's/.*Dest filename: *\|ISCC.exe//g'`
+echo "Inno Setup installed in $ISCCDIR"
+ISCCDIR=`cygpath -u "$ISCCDIR"`
+echo "Inno Setup installed in $ISCCDIR"
+mkdir -p "${ISCCDIR}/Languages/Unofficial"
+cd "${ISCCDIR}/Languages/Unofficial"
+#cd build/windows/installer
+#./compile.bat 2.99.6 ../../.. gimp-w32 gimp-w64 ../../.. gimp-w32 gimp-w64


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]