Merge pull request #17 from Gurkengewuerz/dev
All checks were successful
continuous-integration/drone/push Build is passing

use droneci with mxe
This commit is contained in:
Niklas 2020-06-02 18:32:46 +02:00 committed by GitHub
commit 11c944c122
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 39 additions and 37 deletions

View File

@ -7,22 +7,52 @@ platform:
arch: amd64 arch: amd64
steps: steps:
- name: submodules
image: alpine/git
commands:
- git submodule update --init --recursive
- name: build-mxe
image: ubuntu:bionic
volumes:
- name: cache
path: /release
commands:
- 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
- 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
- export PATH=/usr/lib/mxe/usr/bin:$PATH
- cp /usr/lib/mxe/usr/x86_64-w64-mingw32.shared/include/lmcons.h /usr/lib/mxe/usr/x86_64-w64-mingw32.shared/include/Lmcons.h
- qmake --version
- qmake CONFIG+=nopkg ../KShare.pro
- make -j2
- mkdir dist
- 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${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 - name: build-ubuntu
image: buildpack-deps:19.10 image: buildpack-deps:19.10
volumes: volumes:
- name: cache - name: cache
path: /release path: /release
commands: commands:
- 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 - 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 - qmake --version
- git submodule sync
- git submodule update --init
- mkdir build && pwd && ls -lahR . - mkdir build && pwd && ls -lahR .
- cd build && pwd && ls; qmake ..; make -j2; cd .. - cd build && pwd && ls; qmake ..; make -j2; cd ..
- mkdir /release || true - mkdir /release || true
- cp build/src/kshare /release/ - cp build/src/kshare "/release/kshare_v${DRONE_COMMIT_SHA:0:9}"
- cd packages/; ./makedeb.sh ci; cp *.deb /release/; cd .. - cd packages/; ./makedeb.sh ci; cp *.deb /release/; cd ..
- rm -rf build/
- name: build-arch - name: build-arch
image: archlinux/base:latest image: archlinux/base:latest
@ -30,6 +60,7 @@ steps:
- name: cache - name: cache
path: /release path: /release
commands: commands:
- rm -rf build/ || true
- pacman -Sy && pacman -S --noconfirm base-devel git sudo wget - pacman -Sy && pacman -S --noconfirm base-devel git sudo wget
- "echo 'Set disable_coredump false' >> /etc/sudo.conf" - "echo 'Set disable_coredump false' >> /etc/sudo.conf"
- "mkdir /home/build && useradd --home /home/build --shell=/bin/false build && usermod -L build && chown build:build /home/build && echo 'build ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers && echo 'root ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers" - "mkdir /home/build && useradd --home /home/build --shell=/bin/false build && usermod -L build && chown build:build /home/build && echo 'build ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers && echo 'root ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers"

View File

@ -1,29 +0,0 @@
environment:
QTDIR: C:\Qt\5.9\mingw53_32
platform: x86
build_script:
- dir
- mkdir build
- cd build
- set PATH=%PATH%;%QTDIR%\bin;C:\Qt\Tools\mingw530_32\bin;C:\MinGW\msys\1.0\bin
- git submodule update --init --recursive
- curl -kLO https://ffmpeg.zeranoe.com/builds/win64/dev/ffmpeg-3.3.2-win64-dev.zip
- 7z x ffmpeg-3.3.2-win64-dev.zip
- set FFMPEG_DEV_PATH=%CD%\ffmpeg-3.3.2-win64-dev
- curl -kLO https://ffmpeg.zeranoe.com/builds/win64/shared/ffmpeg-3.3.2-win64-shared.zip
- 7z x ffmpeg-3.3.2-win64-shared.zip
- set FFMPEG_SHARED_PATH=%cd%\ffmpeg-3.3.2-win64-shared
- curl -v -L --http1.1 --tlsv1.2 "https://downloads.sourceforge.net/project/qtav/depends/QtAV-depends-windows-x86+x64.7z" -o av.7z
- 7z x av.7z > NUL
- xcopy ffmpeg-3.3.2-win64-shared\* %QTDIR% /e /i /Y
- xcopy ffmpeg-3.3.2-win64-dev\* %QTDIR% /e /i /Y
- xcopy QtAV-depends-windows-x86+x64\* %QTDIR% /e /i /Y
- qmake CONFIG+=nopkg ../KShare.pro
- mingw32-make.exe -j%NUMBER_OF_PROCESSORS%
- copy src\release\kshare.exe ..\KShare.exe
- cd ..
- bash AppVeyor\make_installer.sh
artifacts:
- path: '*_v*.exe'
- path: '*_v*.zip'
name: Portable version

View File

@ -2,10 +2,10 @@
A [ShareX](https://getsharex.com/) inspired cross platform utility written with Qt. A [ShareX](https://getsharex.com/) inspired cross platform utility written with Qt.
Originally written by [ArsenArsen](https://github.com/ArsenArsen) and here enhanced with [these](https://github.com/Gurkengewuerz/KShare/projects/1) features. Originally written by [ArsenArsen](https://github.com/ArsenArsen) and here enhanced with [these](https://github.com/Gurkengewuerz/KShare/projects/1) features.
| | Linux | Windows | ## Buildstatus (Arch, Ubuntu/Debian and Windows (MXE))
|--------|-------------------------------------------------------------------------------------------------------------------------------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------| **master**|**dev**
| master | [![Build Status](https://giteaci.mc8051.de/api/badges/Gurkengewuerz/KShare/status.svg?ref=refs/heads/master)](https://giteaci.mc8051.de/Gurkengewuerz/KShare) | [![Build status](https://ci.appveyor.com/api/projects/status/ujxmg1dk7f5p8ijh/branch/master?svg=true)](https://ci.appveyor.com/project/Gurkengewuerz/kshare/branch/master) | :-----:|:-----:
| dev | [![Build Status](https://giteaci.mc8051.de/api/badges/Gurkengewuerz/KShare/status.svg?ref=refs/heads/dev)](https://giteaci.mc8051.de/Gurkengewuerz/KShare) | [![Build status](https://ci.appveyor.com/api/projects/status/ujxmg1dk7f5p8ijh/branch/dev?svg=true)](https://ci.appveyor.com/project/Gurkengewuerz/kshare/branch/dev) | [![Build Status](https://giteaci.mc8051.de/api/badges/Gurkengewuerz/KShare/status.svg?ref=refs/heads/master)](https://giteaci.mc8051.de/Gurkengewuerz/KShare)| [![Build Status](https://giteaci.mc8051.de/api/badges/Gurkengewuerz/KShare/status.svg?ref=refs/heads/dev)](https://giteaci.mc8051.de/Gurkengewuerz/KShare)
[Artifacts](https://artifacts.mc8051.de/Gurkengewuerz/KShare) [Artifacts](https://artifacts.mc8051.de/Gurkengewuerz/KShare)