summaryrefslogtreecommitdiffstats
path: root/.ci
diff options
context:
space:
mode:
authorJoe <rubberduckie3554@gmail.com>2019-02-24 21:37:11 -0500
committerJoe <rubberduckie3554@gmail.com>2019-02-24 21:37:11 -0500
commitc1788f0b7d3908240fcd647e0aa449d51e6ef96d (patch)
treef1eb4a10ff8b1f337e2d66d74fbce3e28a2f6b4b /.ci
parente7b4c9ecb281570fe08661419aefa9232ac5222e (diff)
CI Updates
Diffstat (limited to '.ci')
-rwxr-xr-x.ci/install.sh2
-rwxr-xr-x.ci/linux/deploy.sh4
2 files changed, 3 insertions, 3 deletions
diff --git a/.ci/install.sh b/.ci/install.sh
index 585526c1..af935a59 100755
--- a/.ci/install.sh
+++ b/.ci/install.sh
@@ -8,7 +8,7 @@ if [ "$TRAVIS_OS_NAME" == "osx" ]; then
brew upgrade boost cmake icu4c || true
brew tap nlohmann/json
- brew install nlohmann_json
+ brew install --with-cmake nlohmann_json
curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py
sudo python get-pip.py
diff --git a/.ci/linux/deploy.sh b/.ci/linux/deploy.sh
index 38317a4a..cbdf73c3 100755
--- a/.ci/linux/deploy.sh
+++ b/.ci/linux/deploy.sh
@@ -33,8 +33,8 @@ unset LD_LIBRARY_PATH
export ARCH=$(uname -m)
export LD_LIBRARY_PATH=.deps/usr/lib/:$LD_LIBRARY_PATH
-./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 -unsupported-allow-new-glibc -bundle-non-qt-libs
+./linuxdeployqt*.AppImage ${DIR}/usr/share/applications/*.desktop -unsupported-allow-new-glibc -appimage
chmod +x nheko-*x86_64.AppImage