From 519811fd9131afc2cfd0daebd1381ed1399b234d Mon Sep 17 00:00:00 2001 From: AleaJactaEst Date: Tue, 27 Mar 2018 22:40:38 +0200 Subject: [PATCH] update script cross compilation (adding message) --- .gitlab-ci.yml | 32 ++++++++++++++++++++++++++++++++ builder/cross_win32.sh | 4 ++-- 2 files changed, 34 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index dd0a7dd8b..a7f6e5c51 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -24,6 +24,7 @@ # gitlab-runner exec docker --kubernetes-memory-limit='10g' --timeout=3600 'Linux client archlinux build' # gitlab-runner exec docker --kubernetes-memory-limit='10g' --timeout=3600 'Linux client fedora_amd64_27 build' # gitlab-runner exec docker --kubernetes-memory-limit='10g' --timeout=3600 'Linux client ubuntu_amd64_17_10 build' +# gitlab-runner exec docker --kubernetes-memory-limit='10g' --timeout=3600 'Windows client build' stages: - build @@ -520,6 +521,37 @@ Linux client archlinux build: # Gentoo Client +# Windows Client + +Windows client build: + stage: build + tags: + - Docker + image: amd64/debian:9 + script: + # Prepare environment + - dpkg --add-architecture i386 + - apt-get update + - apt-get dist-upgrade -y + - apt-get install -y + p7zip-full + binfmt-support + libc6-i386 + libncurses5:i386 + libfreetype6:i386 + bzip2 + wget + # Action + - mkdir -p wincross + - builder/cross_win32.sh + - ls wincross + - ls wincross/win + artifacts: + name: "khanat-client-windows-$CI_COMMIT_REF_NAME" + paths: + - wincross + expire_in: 2 week + # Job de compilation pour OSX OSX client build: stage: build diff --git a/builder/cross_win32.sh b/builder/cross_win32.sh index 396cb1075..96d0671bc 100755 --- a/builder/cross_win32.sh +++ b/builder/cross_win32.sh @@ -17,7 +17,7 @@ download() if [ ! -e $URLPREFIX$PACK$URLSUFFIX ] then - echo "Downloading $PACK..." + echo "Downloading $PACK... [$URL$URLPREFIX$PACK$URLSUFFIX]" wget -q $URL$URLPREFIX$PACK$URLSUFFIX fi @@ -116,7 +116,7 @@ then export WINEDIR=$BASEWINEDIR/$WINEVERSION/bin if [ ! -d $WINEDIR ] then - echo "Downloading WINE $WINEVERSION..." + echo "Downloading WINE $WINEVERSION... [http://www.playonlinux.com/wine/binaries/linux-amd64/PlayOnLinux-wine-$WINEVERSION-linux-amd64.pol]" wget -q http://www.playonlinux.com/wine/binaries/linux-amd64/PlayOnLinux-wine-$WINEVERSION-linux-amd64.pol echo "Extracting WINE $WINEVERSION..." tar xjf PlayOnLinux-wine-$WINEVERSION-linux-amd64.pol