Install dependencies for arm manually to prevent timeout

This commit is contained in:
Nicolas Werner 2020-05-30 17:37:18 +02:00
parent 50d5891493
commit c8ba385cb9
2 changed files with 3 additions and 9 deletions

View file

@ -3,6 +3,7 @@
set -ex set -ex
if [ "$FLATPAK" ]; then 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 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.Platform//5.14
flatpak --noninteractive install --user flathub org.kde.Sdk//5.14 flatpak --noninteractive install --user flathub org.kde.Sdk//5.14

View file

@ -113,10 +113,6 @@ matrix:
apt: apt:
sources: sources:
- sourceline: 'ppa:alexlarsson/flatpak' - sourceline: 'ppa:alexlarsson/flatpak'
packages:
- flatpak
- flatpak-builder
- elfutils
- os: linux - os: linux
arch: arm64 arch: arm64
env: env:
@ -128,20 +124,17 @@ matrix:
sources: sources:
- sourceline: 'ppa:alexlarsson/flatpak' - sourceline: 'ppa:alexlarsson/flatpak'
packages: packages:
- flatpak
- flatpak-builder
- elfutils
- librsvg2-bin - librsvg2-bin
before_install: before_install:
# Use TRAVIS_TAG if defined, or the short commit SHA otherwise # Use TRAVIS_TAG if defined, or the short commit SHA otherwise
- export VERSION=${TRAVIS_TAG:-$(git rev-parse --short HEAD)} - export VERSION=${TRAVIS_TAG:-$(git rev-parse --short HEAD)}
install: install:
- travis_wait ./.ci/install.sh - ./.ci/install.sh
- export PATH=/usr/local/bin:${PATH} - export PATH=/usr/local/bin:${PATH}
script: script:
- travis_wait ./.ci/script.sh - ./.ci/script.sh
- sed -i -e "s/VERSION_NAME_VALUE/${VERSION}/g" ./.ci/bintray-release.json || true - sed -i -e "s/VERSION_NAME_VALUE/${VERSION}/g" ./.ci/bintray-release.json || true
- cp ./.ci/bintray-release.json . - cp ./.ci/bintray-release.json .
deploy: deploy: