diff --git a/.CI/CreateAppImage.sh b/.CI/CreateAppImage.sh new file mode 100644 index 000000000..6565dc42a --- /dev/null +++ b/.CI/CreateAppImage.sh @@ -0,0 +1,8 @@ +export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/opt/qt512/lib/ +ldd ./bin/chatterino +make INSTALL_ROOT=appdir -j$(nproc) install ; find appdir/ +cp ./resources/icon.png ./appdir/chatterino.png +wget -nv "https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage" +chmod a+x linuxdeployqt-continuous-x86_64.AppImage +./linuxdeployqt-continuous-x86_64.AppImage appdir/usr/share/applications/*.desktop -no-translations -bundle-non-qt-libs -unsupported-allow-new-glibc -appimage -qmake=/opt/qt512/bin/qmake +mv Chatterino-*-x86_64.AppImage Chatterino-x86_64.AppImage diff --git a/.CI/InstallQTStylePlugins.sh b/.CI/InstallQTStylePlugins.sh new file mode 100644 index 000000000..37a0fc3c1 --- /dev/null +++ b/.CI/InstallQTStylePlugins.sh @@ -0,0 +1,6 @@ +git clone http://code.qt.io/qt/qtstyleplugins.git +cd qtstyleplugins +/opt/qt512/bin/qmake CONFIG+=release +make -j$(nproc) +sudo make install +cd - diff --git a/.travis.yml b/.travis.yml index 8c9df8e94..106c9fd69 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,32 +9,30 @@ matrix: addons: apt: sources: - - sourceline: 'ppa:beineri/opt-qt-5.12.0-bionic' + - sourceline: 'ppa:beineri/opt-qt-5.12.3-bionic' packages: - - qt512-meta-full + - qt512-meta-minimal - qt512multimedia - qt512svg - libboost-dev - libgl1-mesa-dev - libboost-system-dev - libboost-filesystem-dev + - libgtk2.0-dev + + install: + - sh ./.CI/InstallQTStylePlugins.sh script: - - export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/opt/qt512/lib/ - /opt/qt512/bin/qmake CONFIG+=release PREFIX=/usr - make -j$(nproc) - - ldd ./bin/chatterino - - make INSTALL_ROOT=appdir -j$(nproc) install ; find appdir/ - - cp ./resources/icon.png ./appdir/chatterino.png - - wget -nv "https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage" && chmod a+x linuxdeployqt-continuous-x86_64.AppImage - - ./linuxdeployqt-continuous-x86_64.AppImage appdir/usr/share/applications/*.desktop -no-translations -unsupported-allow-new-glibc -appimage -qmake=/opt/qt512/bin/qmake - - mv Chatterino-*-x86_64.AppImage Chatterino-x86_64.AppImage before_deploy: - git config --global user.email "builds@travis-ci.com" - git config --global user.name "Travis CI" - export GIT_TAG=nightly-build - git tag $GIT_TAG -f + - sh ./.CI/CreateAppImage.sh deploy: skip_cleanup: true @@ -61,7 +59,7 @@ matrix: - qt - p7zip - create-dmg - + script: - mkdir build && cd build - /usr/local/opt/qt/bin/qmake .. && make -j8