benkyd/flameshot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improve travis & appveyor (#131)

Browse Source 
* improve travis

Add distro name in the packages generated by Travis

* improve appveyor

Add translations in appveyor
This commit is contained in:
Ahmed Zetao Yang
2018-02-24 22:33:15 +08:00
committed by Dharkael
parent 59726e772a
commit 95e5b0eb64
3 changed files with 24 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
.travis.yml
View File

@@ -1,7 +1,5 @@
dist: trusty
sudo: required
services:
- docker
language: cpp
@@ -29,25 +27,31 @@ env:
matrix:
include:
- os: linux
env: OS=fedora DIST=26
env: OS=fedora DIST=26 EXTEN=rpm
services: docker
- os: linux
env: OS=fedora DIST=27
env: OS=fedora DIST=27 EXTEN=rpm
services: docker
- os: linux
# trusty: only for build & test & AppImage
# 14.04 LTS; Qt version is 5.2.1, flameshot not support
env: OS=ubuntu DIST=trusty
env: OS=ubuntu DIST=trusty EXTEN=AppImage
- os: linux
# 16.04 LTS
env: OS=ubuntu DIST=xenial
env: OS=ubuntu DIST=xenial EXTEN=deb
services: docker
- os: linux
# 17.10
env: OS=ubuntu DIST=artful
env: OS=ubuntu DIST=artful EXTEN=deb
services: docker
- os: linux
# 8
env: OS=debian DIST=jessie
env: OS=debian DIST=jessie EXTEN=deb
services: docker
- os: linux
# 9
env: OS=debian DIST=stretch
env: OS=debian DIST=stretch EXTEN=deb
services: docker
- os: osx
compiler: clang
osx_image: xcode9.2

18
.travis_linux.sh
View File

@@ -5,15 +5,15 @@ if [[ "${DIST}" != "trusty" ]]; then
pwd && ls ;
packpack/packpack ;
if [ $OS == "ubuntu" ];
then curl --upload-file build/flameshot_*_*.deb "https://transfer.sh/flameshot_$VERSION-$RELEASE_ubuntu_$ARCH.deb" ;
then curl --upload-file build/flameshot_*_*.deb "https://transfer.sh/flameshot_$VERSION-$DIST-$ARCH_$ARCH.$EXTEN" ;
# copy deb to dist path for distribution
cp build/flameshot_*_*.deb dist/flameshot_$VERSION-$RELEASE_ubuntu_$ARCH.deb ;
cp build/flameshot_*_*.deb dist/flameshot_$VERSION-$DIST-$ARCH_$ARCH.$EXTEN ;
elif [ $OS == "debian" ];
then curl --upload-file build/flameshot_*_*.deb "https://transfer.sh/flameshot_$VERSION-$RELEASE_debian_$ARCH.deb" ;
cp build/flameshot_*_*.deb dist/flameshot_$VERSION-$RELEASE_debian_$ARCH.deb ;
then curl --upload-file build/flameshot_*_*.deb "https://transfer.sh/flameshot_$VERSION-$DIST-$ARCH_$ARCH.$EXTEN" ;
cp build/flameshot_*_*.deb dist/flameshot_$VERSION-$DIST-$ARCH_$ARCH.$EXTEN ;
elif [ $OS == "fedora" ];
then curl --upload-file build/flameshot-$VERSION-$RELEASE.*.$ARCH.rpm "https://transfer.sh/flameshot_$VERSION-$RELEASE_fedora_$ARCH.rpm" ;
cp build/flameshot-$VERSION-$RELEASE.*.$ARCH.rpm dist/flameshot_$VERSION-$RELEASE_fedora_$ARCH.rpm ;
then curl --upload-file build/flameshot-$VERSION-$RELEASE.*.$ARCH.rpm "https://transfer.sh/flameshot_$VERSION-fedora$DIST-$ARCH_$ARCH.$EXTEN" ;
cp build/flameshot-$VERSION-$RELEASE.*.$ARCH.rpm dist/flameshot_$VERSION-fedora$DIST-$ARCH_$ARCH.$EXTEN ;
else echo "";
fi
echo -e "\n" ;
@@ -100,12 +100,12 @@ elif [[ "${DIST}" == "trusty" ]]; then
mkdir dist
# Rename AppImage and move AppImage to DIST_PATH
cd $APPIMAGE_DST_PATH && mv Take_graphical_screenshot-${VERSION}-x86_64.AppImage flameshot_x86_64_${VERSION}.AppImage
cd .. && cp $APPIMAGE_DST_PATH/flameshot_x86_64_${VERSION}.AppImage $DIST_PATH/flameshot_x86_64_${VERSION}.AppImage
cd $APPIMAGE_DST_PATH && mv Take_graphical_screenshot-${VERSION}-${ARCH}.AppImage flameshot_${ARCH}_${VERSION}.AppImage
cd .. && cp $APPIMAGE_DST_PATH/flameshot_${ARCH}_${VERSION}.AppImage $DIST_PATH/flameshot_${ARCH}_${VERSION}.$EXTEN
pwd
curl --upload-file $DIST_PATH/flameshot_x86_64_${VERSION}.AppImage "https://transfer.sh/flameshot_x86_64_${VERSION}.AppImage" ;
curl --upload-file $DIST_PATH/flameshot_${ARCH}_${VERSION}.AppImage "https://transfer.sh/flameshot_${ARCH}_${VERSION}.$EXTEN" ;
exit 0 ;
else echo "" ;

3
appveyor.yml
View File

@@ -54,8 +54,9 @@ after_build:
- echo Build:%build_number% >> "distrib\flameshot\version.txt"
- echo %APPVEYOR_REPO_COMMIT% >> "distrib\flameshot\version.txt"
- copy "distrib\flameshot\flameshot.exe" "distrib\flameshot_win_%PLATFORM%.exe"
- copy "%APPVEYOR_BUILD_FOLDER%\build\translations\Internationalization_*.qm" "distrib\flameshot\translations"
# Delete translations\qt_*.qm
# - del /F /Q "distrib\flameshot\translations\qt_*.qm"
- del /F /Q "distrib\flameshot\translations\qt_*.qm"
# Copy OpenSSL DLLs
- if "%PLATFORM%" EQU "X64" (xcopy "openssl-utils.git\win64\*.dll" "distrib\flameshot")
- if "%PLATFORM%" EQU "x86" (xcopy "openssl-utils.git\win32\*.dll" "distrib\flameshot")