diff --git a/.ci/install.sh b/.ci/install.sh index d1bff54b8957be7e92354c3b3c2e34e48a1b7c04..8d27d3017cd61ddcbcf9095757a9fd1c2e2d3461 100755 --- a/.ci/install.sh +++ b/.ci/install.sh @@ -3,6 +3,7 @@ set -ex if [ "$FLATPAK" ]; then + sudo apt-get -y install flatpak flatpak-builder elfutils flatpak remote-add --user --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo flatpak --noninteractive install --user flathub org.kde.Platform//5.14 flatpak --noninteractive install --user flathub org.kde.Sdk//5.14 diff --git a/.travis.yml b/.travis.yml index 443836cfa82bc9deec1f7cc3ac8704cadd171a67..eec32290e29ec1690dbb90ed1f793b0a3985d803 100644 --- a/.travis.yml +++ b/.travis.yml @@ -113,10 +113,6 @@ matrix: apt: sources: - sourceline: 'ppa:alexlarsson/flatpak' - packages: - - flatpak - - flatpak-builder - - elfutils - os: linux arch: arm64 env: @@ -128,20 +124,17 @@ matrix: sources: - sourceline: 'ppa:alexlarsson/flatpak' packages: - - flatpak - - flatpak-builder - - elfutils - librsvg2-bin before_install: # Use TRAVIS_TAG if defined, or the short commit SHA otherwise - export VERSION=${TRAVIS_TAG:-$(git rev-parse --short HEAD)} install: - - travis_wait ./.ci/install.sh + - ./.ci/install.sh - export PATH=/usr/local/bin:${PATH} script: - - travis_wait ./.ci/script.sh + - ./.ci/script.sh - sed -i -e "s/VERSION_NAME_VALUE/${VERSION}/g" ./.ci/bintray-release.json || true - cp ./.ci/bintray-release.json . deploy: