diff --git a/.ci/linux/create-packages.sh b/.ci/linux/create-packages.sh deleted file mode 100755 index 37c21612..00000000 --- a/.ci/linux/create-packages.sh +++ /dev/null @@ -1,65 +0,0 @@ -#!/usr/bin/env bash - -set -ex - -# -# Create deb & rpm packages from the AppImage. -# - -DIR=package.dir -TAG=`git tag -l --points-at HEAD` - -# Strip `v` from the version tag. -if [[ $TAG == v* ]]; then - TAG=${TAG#?}; -fi - -# Prepend nightly with the latest version. -if [[ $TAG == nightly ]]; then - TAG=${TRAVIS_BUILD_NUMBER}.nightly -fi - -if [ -z "$TAG" ]; then - TAG=`git rev-parse --abbrev-ref HEAD` -fi - -# Installing dependencies on travis. -if [ ! -z "$TRAVIS_OS_NAME" ]; then - sudo apt-add-repository -y ppa:brightbox/ruby-ng - sudo apt-get update -qq - sudo apt-get install -y ruby2.1 ruby-switch - sudo ruby-switch --set ruby2.1 - sudo apt-get install -y ruby2.1-dev rpm libffi-dev - - sudo gem install --no-ri --no-rdoc fpm -fi - -# Set up deb structure. -mkdir -p ${DIR}/usr/{bin,share/pixmaps,share/applications} - -# Copy resources. -cp nheko*.AppImage ${DIR}/usr/bin/nheko -cp resources/nheko.desktop ${DIR}/usr/share/applications/nheko.desktop -cp resources/nheko.png ${DIR}/usr/share/pixmaps/nheko.png - -for iconSize in 16 32 48 64 128 256 512; do - IconDir=${DIR}/usr/share/icons/hicolor/${iconSize}x${iconSize}/apps - mkdir -p ${IconDir} - cp resources/nheko-${iconSize}.png ${IconDir}/nheko.png -done - -fpm --force \ - -s dir \ - --output-type deb \ - --name nheko \ - --description "Desktop client for the Matrix protocol" \ - --url "https://github.com/mujx/nheko" \ - --version ${TAG} \ - --architecture x86_64 \ - --maintainer "mujx (https://github.com/mujx)" \ - --license "GPLv3" \ - --prefix / \ - --deb-no-default-config-files \ - --chdir ${DIR} usr - -fpm -s deb -t rpm nheko_${TAG}_amd64.deb diff --git a/.travis.yml b/.travis.yml index 5454b68c..2047a2db 100644 --- a/.travis.yml +++ b/.travis.yml @@ -59,10 +59,6 @@ install: script: - ./.ci/script.sh -before_deploy: - - export RELEASE_DEB_FILE=$(ls *.deb) - - export RELEASE_RPM_FILE=$(ls *.rpm) - deploy: - skip_cleanup: true overwrite: true @@ -72,8 +68,6 @@ deploy: file_glob: true file: - nheko-x86_64.AppImage - - $RELEASE_DEB_FILE - - $RELEASE_RPM_FILE on: condition: $TRAVIS_OS_NAME == linux && $DEPLOYMENT == 1 repo: mujx/nheko diff --git a/Makefile b/Makefile index a8478105..606ae24b 100644 --- a/Makefile +++ b/Makefile @@ -28,7 +28,6 @@ debian-image: linux-deploy: ./.ci/linux/deploy.sh - ./.ci/linux/create-packages.sh macos-deploy: ./.ci/macos/deploy.sh