mirror of
https://github.com/Nheko-Reborn/nheko.git
synced 2024-11-25 20:48:52 +03:00
Fix the appimage generation
This commit is contained in:
parent
a72eca339f
commit
2749afbb91
5 changed files with 17 additions and 19 deletions
|
@ -5,14 +5,14 @@
|
||||||
"matrixParams": {
|
"matrixParams": {
|
||||||
"override": 1
|
"override": 1
|
||||||
},
|
},
|
||||||
"uploadPattern": "VERSION_NAME_VALUE/nheko-VERSION_NAME_VALUE.dmg"
|
"uploadPattern": "nheko/VERSION_NAME_VALUE/nheko-VERSION_NAME_VALUE.dmg"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"includePattern": "nheko-VERSION_NAME_VALUE-x86_64.AppImage",
|
"includePattern": "nheko-VERSION_NAME_VALUE-x86_64.AppImage",
|
||||||
"matrixParams": {
|
"matrixParams": {
|
||||||
"override": 1
|
"override": 1
|
||||||
},
|
},
|
||||||
"uploadPattern": "VERSION_NAME_VALUE/nheko-VERSION_NAME_VALUE-x86_64.AppImage"
|
"uploadPattern": "nheko/VERSION_NAME_VALUE/nheko-VERSION_NAME_VALUE-x86_64.AppImage"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"package": {
|
"package": {
|
||||||
|
|
|
@ -5,7 +5,7 @@ set -ex
|
||||||
if [ $TRAVIS_OS_NAME == osx ]; then
|
if [ $TRAVIS_OS_NAME == osx ]; then
|
||||||
brew update
|
brew update
|
||||||
brew install qt5 lmdb clang-format ninja libsodium spdlog
|
brew install qt5 lmdb clang-format ninja libsodium spdlog
|
||||||
brew upgrade boost
|
brew upgrade boost cmake
|
||||||
|
|
||||||
curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py
|
curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py
|
||||||
sudo python get-pip.py
|
sudo python get-pip.py
|
||||||
|
@ -24,16 +24,17 @@ if [ $TRAVIS_OS_NAME == linux ]; then
|
||||||
QT_PKG="59"
|
QT_PKG="59"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
wget https://cmake.org/files/v3.11/cmake-3.11.4-Linux-x86_64.sh
|
||||||
|
sudo sh cmake-3.11.4-Linux-x86_64.sh --skip-license --prefix=/usr/local
|
||||||
|
|
||||||
sudo add-apt-repository -y ppa:chris-lea/libsodium
|
sudo add-apt-repository -y ppa:chris-lea/libsodium
|
||||||
sudo add-apt-repository -y ppa:beineri/opt-qt${QT_VERSION}-trusty
|
sudo add-apt-repository -y ppa:beineri/opt-qt${QT_VERSION}-trusty
|
||||||
sudo add-apt-repository -y ppa:george-edison55/cmake-3.x
|
|
||||||
sudo apt-get update -qq
|
sudo apt-get update -qq
|
||||||
sudo apt-get install -qq -y \
|
sudo apt-get install -qq -y \
|
||||||
qt${QT_PKG}base \
|
qt${QT_PKG}base \
|
||||||
qt${QT_PKG}tools \
|
qt${QT_PKG}tools \
|
||||||
qt${QT_PKG}svg \
|
qt${QT_PKG}svg \
|
||||||
qt${QT_PKG}multimedia \
|
qt${QT_PKG}multimedia \
|
||||||
cmake \
|
|
||||||
liblmdb-dev \
|
liblmdb-dev \
|
||||||
libsodium-dev
|
libsodium-dev
|
||||||
fi
|
fi
|
||||||
|
|
|
@ -32,6 +32,10 @@ unset LD_LIBRARY_PATH
|
||||||
|
|
||||||
export ARCH=$(uname -m)
|
export ARCH=$(uname -m)
|
||||||
|
|
||||||
|
if [ ! -z $TRAVIS_TAG ]; then
|
||||||
|
export LD_LIBRARY_PATH=.deps/usr/lib/:/opt/qt${QT_PKG}/lib/:$LD_LIBRARY_PATH
|
||||||
|
fi
|
||||||
|
|
||||||
./linuxdeployqt*.AppImage ${DIR}/usr/share/applications/*.desktop -bundle-non-qt-libs
|
./linuxdeployqt*.AppImage ${DIR}/usr/share/applications/*.desktop -bundle-non-qt-libs
|
||||||
./linuxdeployqt*.AppImage ${DIR}/usr/share/applications/*.desktop -appimage
|
./linuxdeployqt*.AppImage ${DIR}/usr/share/applications/*.desktop -appimage
|
||||||
|
|
||||||
|
|
|
@ -63,6 +63,7 @@ before_install:
|
||||||
|
|
||||||
install:
|
install:
|
||||||
- ./.ci/install.sh
|
- ./.ci/install.sh
|
||||||
|
- export PATH=/usr/local/bin:${PATH}
|
||||||
|
|
||||||
script:
|
script:
|
||||||
- ./.ci/script.sh
|
- ./.ci/script.sh
|
||||||
|
|
20
appveyor.yml
20
appveyor.yml
|
@ -6,6 +6,10 @@ configuration: Release
|
||||||
image: Visual Studio 2017
|
image: Visual Studio 2017
|
||||||
platform: x64
|
platform: x64
|
||||||
|
|
||||||
|
environment:
|
||||||
|
BINTRAY_APIKEY:
|
||||||
|
secure: "hhhAH6csIrPEVH92NNQkiGCkuON6l6sfhbZk+pvzDAM3vHex7YbqFKW6v5UjAS8v"
|
||||||
|
|
||||||
cache: c:\tools\vcpkg\installed\
|
cache: c:\tools\vcpkg\installed\
|
||||||
|
|
||||||
build:
|
build:
|
||||||
|
@ -114,20 +118,8 @@ after_build:
|
||||||
|
|
||||||
- mv nheko-installer.exe nheko-%APPVEYOR_REPO_TAG_NAME%-installer.exe
|
- mv nheko-installer.exe nheko-%APPVEYOR_REPO_TAG_NAME%-installer.exe
|
||||||
|
|
||||||
deploy:
|
on_success:
|
||||||
provider: BinTray
|
- if "%APPVEYOR_REPO_TAG%" == "true" (curl -T nheko-%APPVEYOR_REPO_TAG_NAME%-installer.exe -umujx:%BINTRAY_APIKEY% https://api.bintray.com/content/mujx/matrix/nheko/%APPVEYOR_REPO_TAG_NAME%/nheko/%APPVEYOR_REPO_TAG_NAME%/)
|
||||||
username: mujx
|
|
||||||
api_key:
|
|
||||||
secure: "hhhAH6csIrPEVH92NNQkiGCkuON6l6sfhbZk+pvzDAM3vHex7YbqFKW6v5UjAS8v"
|
|
||||||
subject: mujx
|
|
||||||
repo: matrix
|
|
||||||
package: nheko
|
|
||||||
version: $(APPVEYOR_REPO_TAG_NAME)
|
|
||||||
publish: true
|
|
||||||
override: true
|
|
||||||
artifact: nheko-$(APPVEYOR_REPO_TAG_NAME)-installer.exe
|
|
||||||
on:
|
|
||||||
appveyor_repo_tag: true
|
|
||||||
|
|
||||||
artifacts:
|
artifacts:
|
||||||
- path: nheko_win_64.zip
|
- path: nheko_win_64.zip
|
||||||
|
|
Loading…
Reference in a new issue