From 20674ecfe0419008cd348bfedf88d8f915181ce6 Mon Sep 17 00:00:00 2001
From: Jun Aruga <junaruga@users.noreply.github.com>
Date: Sun, 7 Apr 2019 15:04:56 +0200
Subject: [PATCH] .travis.yml: Small improvements for if statement and apt-get
 install. (#64)

---
 .travis.yml | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 3be1713..39bac4c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,15 @@
+dist: xenial
 services: docker
 language: bash
+addons:
+    apt:
+        config:
+            retries: true
+        update: true
+        packages:
+            - jq
+            - rpm2cpio
+            - cpio
 env:
     global:
         - VERSION=3.1.0-3
@@ -7,17 +17,18 @@ env:
         - PACKAGE_URI="https://kojipkgs.fedoraproject.org/packages/qemu/3.1.0/6.fc30/x86_64/qemu-user-static-3.1.0-6.fc30.x86_64.rpm"
         - PACKAGE_FILENAME=$(basename "$PACKAGE_URI")
 before_script:
-    - sudo apt-get install jq rpm2cpio cpio
     - wget --content-disposition $PACKAGE_URI
     - rpm2cpio $PACKAGE_FILENAME | cpio -dimv
 script:
     - ./generate_tarballs.sh
     - |
       if [[ $TRAVIS_BRANCH == 'master' && $TRAVIS_PULL_REQUEST == 'false' ]]; then
-        ./publish.sh -v "$VERSION" -t "$GITHUB_TOKEN" -r "$REPO" && ./update.sh -v "$VERSION" -r "$REPO";
+          ./publish.sh -v "$VERSION" -t "$GITHUB_TOKEN" -r "$REPO" && \
+              ./update.sh -v "$VERSION" -r "$REPO"
       fi
 after_success:
     - |
       if [[ $TRAVIS_BRANCH == 'master' && $TRAVIS_PULL_REQUEST == 'false' ]]; then
-        docker login -u="$DOCKER_USERNAME" -p="$DOCKER_PASSWORD" && docker push $REPO;
+          docker login -u="$DOCKER_USERNAME" -p="$DOCKER_PASSWORD" && \
+              docker push $REPO
       fi