From df9a7cc096a33d2853e2a4eb3f9c812c45b66211 Mon Sep 17 00:00:00 2001
From: Gurkengewuerz <niklas@schuetrumpf.net>
Date: Tue, 2 Jun 2020 17:39:47 +0200
Subject: [PATCH] ci is so trial and error

---
 .drone.yml | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index 5f7cd5c..8baab4d 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -10,7 +10,7 @@ steps:
   - name: submodules
     image: alpine/git
     commands:
-    - git submodule update --recursive --remote
+    - git submodule update --init --recursive
 
   - name: build-mxe
     image: ubuntu:bionic
@@ -18,13 +18,12 @@ steps:
       - name: cache
         path: /release
     commands:
-      - export KSHAREVER=$(cat src/main.cpp | grep setApplicationVersion | sed "s/\\s*a.setApplicationVersion(\"//g" | sed "s/\");//g")
       - rm -rf build/ || true
       - apt-get update && apt-get install -yqq wget gnupg2 curl rsync p7zip git
       - mkdir build && pwd && ls -lahR .
       - cd build
       - wget -qO - https://pkg.mxe.cc/repos/apt/client-conf/mxeapt.gpg | apt-key add -
-      - echo "deb https://pkg.mxe.cc/repos/apt/ bionic main" >> /etc/apt/sources.list
+      - echo 'deb https://pkg.mxe.cc/repos/apt/ bionic main' >> /etc/apt/sources.list
       - apt-get update && apt-get install -yqq mxe-x86-64-w64-mingw32.shared-qtbase mxe-x86-64-w64-mingw32.shared-qtmultimedia mxe-x86-64-w64-mingw32.shared-qttools mxe-x86-64-w64-mingw32.shared-qtwinextras
       - apt-get install -yqq mxe-x86-64-w64-mingw32.shared-ffmpeg
       - export PATH=/usr/lib/mxe/usr/x86_64-w64-mingw32.shared/qt5/bin:$PATH
@@ -37,7 +36,8 @@ steps:
       - cp src/release/kshare.exe dist/KShare.exe
       - /usr/lib/mxe/tools/copydlldeps.sh --infile dist/KShare.exe --destdir dist/ --recursivesrcdir /usr/lib/mxe/usr/x86_64-w64-mingw32.shared/ --srcdir ../src/ --copy --enforcedir /usr/lib/mxe/usr/x86_64-w64-mingw32.shared/qt5/plugins/platforms/ --objdump /usr/lib/mxe/usr/bin/x86_64-w64-mingw32.shared-objdump
       - mkdir dist/mediaservice; cp /usr/lib/mxe/usr/x86_64-w64-mingw32.shared/qt5/plugins/mediaservice/dsengine.dll dist/mediaservice
-      - cd dist/; cp KShare.exe /release/KShare_v${KSHAREVER}.exe; zip -r /release/win_kshare_v${KSHAREVER}_portable.zip *
+      - cd dist/; cp KShare.exe "/release/KShare_v${DRONE_COMMIT_SHA:0:9}.exe"; zip -r "/release/win_kshare_v${DRONE_COMMIT_SHA:0:9}_portable.zip" *
+      - ls -lahR /release/
 
   - name: build-ubuntu
     image: buildpack-deps:19.10
@@ -45,14 +45,13 @@ steps:
       - name: cache
         path: /release
     commands:
-      - export KSHAREVER=$(cat src/main.cpp | grep setApplicationVersion | sed "s/\\s*a.setApplicationVersion(\"//g" | sed "s/\");//g")
       - rm -rf build/ || true
       - apt-get update -yqq && apt-get install -yqq build-essential cmake \gcc g++ qt5-default qt5-qmake qtmultimedia5-dev libqt5svg5-dev libx11-dev libavformat-dev libavcodec-dev libavutil-dev libswscale-dev libqt5x11extras5-dev libxcb-util-dev libxcb-cursor-dev libxcb1-dev 
       - qmake --version
       - mkdir build && pwd && ls -lahR .
       - cd build && pwd && ls; qmake ..; make -j2; cd ..
       - mkdir /release || true
-      - cp build/src/kshare /release/kshare_v${KSHAREVER}
+      - cp build/src/kshare "/release/kshare_v${DRONE_COMMIT_SHA:0:9}"
       - cd packages/; ./makedeb.sh ci; cp *.deb /release/; cd ..
 
   - name: build-arch