diff options
| -rw-r--r-- | .gitlab-ci.yml | 56 | ||||
| -rw-r--r-- | AppImageBuilder.yml | 119 | ||||
| -rw-r--r-- | Dockerfile | 47 |
3 files changed, 0 insertions, 222 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1012c690..2f0ec910 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -177,59 +177,3 @@ linting: - make lint - make license -appimage-amd64: - stage: build - image: appimagecrafters/appimage-builder - tags: [docker] - variables: - QT_PKG: 515 - before_script: - # app build requirements - - apt-get update && apt-get install -y software-properties-common - - add-apt-repository ppa:beineri/opt-qt-5.15.2-bionic -y - - apt-get update - - apt-get install -y git wget curl - - # update appimage-builder (optional) - - pip3 install --upgrade git+https://github.com/AppImageCrafters/appimage-builder.git - - - apt-get update && apt-get -y install --no-install-recommends g++-7 build-essential ninja-build qt${QT_PKG}{base,declarative,tools,multimedia,script,quickcontrols2,svg} liblmdb-dev libssl-dev git ninja-build qt5keychain-dev libgtest-dev ccache libevent-dev libcurl4-openssl-dev libgl1-mesa-dev - - wget https://github.com/Kitware/CMake/releases/download/v3.19.0/cmake-3.19.0-Linux-x86_64.sh && sh cmake-3.19.0-Linux-x86_64.sh --skip-license --prefix=/usr/local - - /usr/sbin/update-ccache-symlinks - script: - - export PATH="/usr/local/bin/:/usr/lib/ccache:${PATH}" - - export CMAKE_BUILD_PARALLEL_LEVEL=$(cat /proc/cpuinfo | awk '/^processor/{print $3}' | wc -l) - - . "/opt/qt${QT_PKG}/bin/qt${QT_PKG}-env.sh" || true - - cmake -H. -Bbuild -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr -GNinja - -DHUNTER_ROOT=".hunter" - -DHUNTER_ENABLED=ON -DBUILD_SHARED_LIBS=OFF - -DHUNTER_CONFIGURATION_TYPES=Release - -DUSE_BUNDLED_SPDLOG=ON - -DUSE_BUNDLED_OLM=ON - -DUSE_BUNDLED_GTEST=OFF - -DUSE_BUNDLED_CMARK=ON - -DUSE_BUNDLED_JSON=ON - -DUSE_BUNDLED_OPENSSL=OFF - -DUSE_BUNDLED_MTXCLIENT=ON - -DUSE_BUNDLED_LMDB=OFF - -DUSE_BUNDLED_LMDBXX=ON - -DUSE_BUNDLED_QTKEYCHAIN=OFF - -DUSE_BUNDLED_LIBEVENT=OFF - -DUSE_BUNDLED_LIBCURL=OFF - -DUSE_BUNDLED_COEURL=ON - - DESTDIR=`pwd`/AppDir ninja -C build install/local - - DESTDIR=`pwd`/AppDir ninja -C build _deps/cmark-build/src/install - - mkdir -p AppDir/usr/lib/x86_64-linux-gnu AppDir/lib/x86_64-linux-gnu - - appimage-builder --skip-test - after_script: - - bash ./.ci/upload-nightly-gitlab.sh nheko-latest-x86_64.AppImage - artifacts: - paths: - - 'nheko-latest-x86_64.AppImage' - expire_in: 1 week - expose_as: 'appimage-amd64' - cache: - key: "$CI_JOB_NAME" - paths: - - .hunter/ - - .ccache diff --git a/AppImageBuilder.yml b/AppImageBuilder.yml deleted file mode 100644 index 804fa03f..00000000 --- a/AppImageBuilder.yml +++ /dev/null @@ -1,119 +0,0 @@ -# appimage-builder recipe see https://appimage-builder.readthedocs.io for details -version: 1 -AppDir: - path: ./AppDir - app_info: - id: nheko - name: nheko - icon: nheko - version: latest - exec: usr/bin/nheko - exec_args: $@ - runtime: - env: - APPDIR_LIBRARY_PATH: $APPDIR/usr/lib/x86_64-linux-gnu:$APPDIR/usr/lib/x86_64-linux-gnu/gstreamer-1.0:$APPDIR/usr/lib/x86_64-linux-gnu/gconv:$APPDIR/lib/x86_64-linux-gnu:$APPDIR/usr/lib/x86_64-linux-gnu/pulseaudio - apt: - arch: amd64 - allow_unauthenticated: true - sources: - - sourceline: deb http://de.archive.ubuntu.com/ubuntu/ bionic main restricted - - sourceline: deb http://de.archive.ubuntu.com/ubuntu/ bionic-updates main restricted - - sourceline: deb http://de.archive.ubuntu.com/ubuntu/ bionic universe - - sourceline: deb http://de.archive.ubuntu.com/ubuntu/ bionic-updates universe - - sourceline: deb http://de.archive.ubuntu.com/ubuntu/ bionic multiverse - - sourceline: deb http://de.archive.ubuntu.com/ubuntu/ bionic-updates multiverse - - sourceline: deb http://de.archive.ubuntu.com/ubuntu/ bionic-backports main restricted - universe multiverse - - sourceline: deb http://security.ubuntu.com/ubuntu bionic-security main restricted - - sourceline: deb http://security.ubuntu.com/ubuntu bionic-security universe - - sourceline: deb http://security.ubuntu.com/ubuntu bionic-security multiverse - - sourceline: deb http://ppa.launchpad.net/beineri/opt-qt-5.15.2-bionic/ubuntu bionic main - include: - - gstreamer1.0-libav - - gstreamer1.0-plugins-bad - - gstreamer1.0-plugins-base - - gstreamer1.0-plugins-good - - gstreamer1.0-pulseaudio - - gstreamer1.0-x - - kimageformat-plugins - - libbs2b0 - - libbz2-1.0 - - libcurl4 - - libelf1 - - libexpat1 - - libevent-core-2.1-6 - - libevent-pthreads-2.1-6 - - libhogweed4 - - libjpeg-turbo8 - - libkf5archive5 - - libllvm10 - - liblmdb0 - - liblz4-1 - - libnorm1 - - libnss-mdns - - libopenexr22 - - libpcre3 - - libqt5keychain1 - - qt515base - - qt515declarative - - qt515tools - - qt515multimedia - - qt515script - - qt515quickcontrols2 - - qt515svg - - librubberband2 - - libsensors4 - - libsm6 - - libsnappy1v5 - - libsystemd0 - - libwayland-server0 - - libx264-152 - - libxau6 - - libxcb-render-util0 - - libxcb-sync1 - - libxcb-xinerama0 - - libxcb-xkb1 - - libxcursor1 - - libxdmcp6 - - libxext6 - - libxfixes3 - - libxrender1 - - libxshmfence1 - - libxv1 - - libxxf86vm1 - - libzstd1 - - qt515imageformats - exclude: [] - files: - exclude: - - usr/share/man - - usr/share/doc - - opt/qt515/examples - - opt/qt515/bin - - opt/qt515/include - - opt/qt515/mkspecs - test: - fedora: - image: appimagecrafters/tests-env:fedora-30 - command: ./AppRun - use_host_x: true - debian: - image: appimagecrafters/tests-env:debian-stable - command: ./AppRun - use_host_x: true - arch: - image: appimagecrafters/tests-env:archlinux-latest - command: ./AppRun - use_host_x: true - centos: - image: appimagecrafters/tests-env:centos-7 - command: ./AppRun - use_host_x: true - ubuntu: - image: appimagecrafters/tests-env:ubuntu-xenial - command: ./AppRun - use_host_x: true -AppImage: - arch: x86_64 - update-information: None - sign-key: None diff --git a/Dockerfile b/Dockerfile deleted file mode 100644 index dddd1c6f..00000000 --- a/Dockerfile +++ /dev/null @@ -1,47 +0,0 @@ -FROM ubuntu:trusty - -RUN \ - apt-get update -qq && \ - apt-get install -y software-properties-common && \ - add-apt-repository -y ppa:beineri/opt-qt-5.10.1-trusty && \ - add-apt-repository -y ppa:ubuntu-toolchain-r/test && \ - apt-get update -qq && \ - apt-get install -y \ - qt510base qt510tools qt510svg qt510multimedia qt510quickcontrols2 qt510graphicaleffects \ - gcc-5 g++-5 - -RUN \ - apt-get install -y \ - make \ - pkg-config \ - ninja-build \ - liblmdb-dev \ - libssl-dev \ - mesa-common-dev \ - wget \ - fuse \ - git - -RUN \ - wget https://cmake.org/files/v3.12/cmake-3.12.2-Linux-x86_64.sh && \ - sh cmake-3.12.2-Linux-x86_64.sh --skip-license --prefix=/usr/local - -RUN \ - update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-5 10 && \ - update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-5 10 && \ - update-alternatives --set gcc "/usr/bin/gcc-5" && \ - update-alternatives --set g++ "/usr/bin/g++-5" - -RUN \ - mkdir libsodium-1.0.14 && \ - wget https://download.libsodium.org/libsodium/releases/old/libsodium-1.0.14.tar.gz && \ - tar -xzvf libsodium-1.0.14.tar.gz -C libsodium-1.0.14 && \ - cd libsodium-1.0.14/libsodium-1.0.14 && \ - ./configure && \ - make && make install - -ENV PATH=/opt/qt510/bin:$PATH - -RUN mkdir /build - -WORKDIR /build |