From 243ca55234306d31300775ff7455b46755e33719 Mon Sep 17 00:00:00 2001 From: Konstantinos Sideris Date: Sun, 12 Aug 2018 11:35:56 +0300 Subject: [PATCH] Bump version to 0.5.3 --- CMakeLists.txt | 2 +- Dockerfile.debian | 20 -------------------- Makefile | 7 ------- appveyor.yml | 12 ++++++------ resources/nheko.appdata.xml | 3 ++- 5 files changed, 9 insertions(+), 35 deletions(-) delete mode 100644 Dockerfile.debian diff --git a/CMakeLists.txt b/CMakeLists.txt index 365304a8..d2798364 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -13,7 +13,7 @@ include(QtCommon) project(nheko LANGUAGES C CXX) set(CPACK_PACKAGE_VERSION_MAJOR "0") set(CPACK_PACKAGE_VERSION_MINOR "5") -set(CPACK_PACKAGE_VERSION_PATCH "2") +set(CPACK_PACKAGE_VERSION_PATCH "3") set(PROJECT_VERSION_MAJOR ${CPACK_PACKAGE_VERSION_MAJOR}) set(PROJECT_VERSION_MINOR ${CPACK_PACKAGE_VERSION_MINOR}) set(PROJECT_VERSION_PATCH ${CPACK_PACKAGE_VERSION_PATCH}) diff --git a/Dockerfile.debian b/Dockerfile.debian deleted file mode 100644 index 593b7f20..00000000 --- a/Dockerfile.debian +++ /dev/null @@ -1,20 +0,0 @@ -FROM debian:unstable - -RUN apt-get update -y -qq - -RUN apt-get install -y gcc g++ cmake clang liblmdb-dev - -RUN apt-get install -y mesa-common-dev wget fuse git - -RUN apt-get update -qq && \ - apt-get install -y \ - qt5-default \ - libqt5svg5-dev \ - qtbase5-dev \ - qttools5-dev-tools \ - qttools5-dev \ - qtmultimedia5-dev - -RUN mkdir /build - -WORKDIR /build diff --git a/Makefile b/Makefile index 584aafa2..76299c89 100644 --- a/Makefile +++ b/Makefile @@ -40,9 +40,6 @@ lint: image: docker build -t nheko-app-image . -debian-image: - docker build -f Dockerfile.debian -t nheko-debian-appimage . - linux-deploy: ./.ci/linux/deploy.sh @@ -58,10 +55,6 @@ docker-app-image: image --privileged \ -v `pwd`:/build nheko-app-image make linux-deploy -docker-debian-appimage: debian-image - docker run -v `pwd`:/build nheko-debian-appimage make release - docker run --privileged -v `pwd`:/build nheko-debian-appimage make linux-deploy - update-translations: lupdate \ -locations relative \ diff --git a/appveyor.yml b/appveyor.yml index b63a0f5b..cdd4eff4 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,6 +1,6 @@ --- -version: 0.5.2-{build} +version: 0.5.3-{build} configuration: Release image: Visual Studio 2017 @@ -37,8 +37,8 @@ build_script: # VERSION format: branch-master/branch-1.2 # INSTVERSION format: x.y.z # WINVERSION format: 9999.0.0.123/1.2.0.234 - - if "%APPVEYOR_REPO_TAG%"=="false" set INSTVERSION=0.5.2 - - if "%APPVEYOR_REPO_TAG%"=="false" set VERSION=0.5.2 + - if "%APPVEYOR_REPO_TAG%"=="false" set INSTVERSION=0.5.3 + - if "%APPVEYOR_REPO_TAG%"=="false" set VERSION=0.5.3 - if "%APPVEYOR_REPO_TAG%"=="false" if "%APPVEYOR_REPO_BRANCH%"=="master" set INSTVERSION=9999.0 - if "%APPVEYOR_REPO_TAG%"=="false" set WINVERSION=%INSTVERSION%.0.%APPVEYOR_BUILD_NUMBER% # VERSION format: v1.2.3/v1.3.4 @@ -105,9 +105,9 @@ after_build: - copy %BUILD%\deploy\installer\cleanup\package.xml installer\packages\com.mujx.nheko.cleanup\meta - copy %BUILD%\deploy\installer\cleanup\installscript.qs installer\packages\com.mujx.nheko.cleanup\meta # Amend version and date - - sed -i "s/__VERSION__/0.5.2/" installer\config\config.xml - - sed -i "s/__VERSION__/0.5.2/" installer\packages\com.mujx.nheko\meta\package.xml - - sed -i "s/__VERSION__/0.5.2/" installer\packages\com.mujx.nheko.cleanup\meta\package.xml + - sed -i "s/__VERSION__/0.5.3/" installer\config\config.xml + - sed -i "s/__VERSION__/0.5.3/" installer\packages\com.mujx.nheko\meta\package.xml + - sed -i "s/__VERSION__/0.5.3/" installer\packages\com.mujx.nheko.cleanup\meta\package.xml - sed -i "s/__DATE__/%DATE%/" installer\packages\com.mujx.nheko\meta\package.xml - sed -i "s/__DATE__/%DATE%/" installer\packages\com.mujx.nheko.cleanup\meta\package.xml # Copy nheko data diff --git a/resources/nheko.appdata.xml b/resources/nheko.appdata.xml index 79efe2cf..58cd9707 100644 --- a/resources/nheko.appdata.xml +++ b/resources/nheko.appdata.xml @@ -13,12 +13,13 @@ - https://dl.dropboxusercontent.com/s/fvlupc271m5y2hd/nheko-linux.png + https://dl.dropboxusercontent.com/s/x638uft1fcnybv9/nheko-gnome.png https://github.com/mujx/nheko https://github.com/mujx +