From a4957c7584b70ebe6ffe0cf7f230f866d7c9a105 Mon Sep 17 00:00:00 2001
From: Frank Wunderlich <frank-w@public-files.de>
Date: Wed, 23 Sep 2020 09:09:32 +0200
Subject: [PATCH] travis: some fixes

- fix FIT build (device-tree-compiler)
- building main,rc and travis branches, but upload only main
---
 .travis.yml | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 3ac07c77eb803..6a46863f9f5f0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,18 +7,19 @@ cache: ccache
 git:
   depth: 10
   quiet: false
-  
+
 if: tag IS blank
 
 branches:
   only:
     - /^.*-main$/
+    - /^.*-rc$/
     - /^.*-travis$/
 
 install:
     - sudo apt-add-repository 'deb http://archive.ubuntu.com/ubuntu focal main'
     - sudo apt-get update -qq
-    - sudo apt-get install -qq ccache libssl-dev u-boot-tools python-mako debhelper fakeroot gcc-arm-linux-gnueabihf gcc-aarch64-linux-gnu make
+    - sudo apt-get install -qq ccache libssl-dev u-boot-tools python-mako debhelper fakeroot gcc-arm-linux-gnueabihf gcc-aarch64-linux-gnu make device-tree-compiler
 script:
     - export PATH=/usr/lib/ccache:$PATH
     - bash build.sh importconfig
@@ -39,13 +40,14 @@ before_deploy:
     - export TRAVIS_TAG=${TRAVIS_TAG:-"CI-BUILD-$(date +'%Y%m%d_%H%M%S')-$(git log --format=%h -1)"}
     - git tag $TRAVIS_TAG
 deploy:
+    on:
+      branch: /^.*-main$/
+#     all_branches: true
     provider: releases
     token: $GITHUB_TOKEN
-#    file_glob: true
-#    file:
-#    - "../SD/*"
-#    - "../*.deb"
-#    name: $TRAVIS_BRANCH-$(date +'%Y%m%d%H%M%S')
+    file_glob: true
+    file:
+    - "../SD/*"
+    - "../*.deb"
+    name: $TRAVIS_BRANCH-$(date +'%Y%m%d%H%M%S')
     cleanup: false
-    on:
-        all_branches: true