From 6e03b7f57231b84950d3d75f5916f4032e6fd84b Mon Sep 17 00:00:00 2001
From: Antenore Gatta <antenore@simbiosi.org>
Date: Mon, 14 May 2018 21:01:16 +0200
Subject: Enable travis cache for flatpak

---
 .travis.yml              | 6 +++++-
 flatpak/flatpak-build.sh | 4 +++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index d41e7eea0..766cefefc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -32,8 +32,12 @@
 #
 
 sudo: required
+
 language: generic
-cache: ccache
+
+cache:
+  - paths:
+    - .flatpak-builder/
 
 group: edge
 
diff --git a/flatpak/flatpak-build.sh b/flatpak/flatpak-build.sh
index 1f6fa2c7d..b6e17eaec 100755
--- a/flatpak/flatpak-build.sh
+++ b/flatpak/flatpak-build.sh
@@ -14,6 +14,8 @@ flatpak_builder()
 
 FLATPAK_MANIFEST_DIR=$(dirname "$(readlink -f "$0")")
 
+mkdir -p ~/.ccache/ && touch ~/.ccache/ccache.conf
+
 cd "${FLATPAK_MANIFEST_DIR}"
 
 # Build everything but Remmina module
@@ -21,7 +23,7 @@ flatpak_builder \
     --force-clean \
     --install-deps-from=flathub \
     --stop-at=remmina \
-    app/ org.remmina.Remmina.json
+    app/ org.remmina.Remmina.json --ccache
 
 # Build Remmina module from local checkout
 mkdir -p _flatpak_build
-- 
cgit v1.2.3


From 4631d510e1810349690cc2b2f7b1c602d08514e6 Mon Sep 17 00:00:00 2001
From: Antenore Gatta <antenore@simbiosi.org>
Date: Mon, 14 May 2018 21:14:35 +0200
Subject: Create cache for flat_builder

---
 .travis.yml              | 9 ++++++---
 flatpak/flatpak-build.sh | 2 --
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 766cefefc..e59d7f480 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -36,8 +36,8 @@ sudo: required
 language: generic
 
 cache:
-  - paths:
-    - .flatpak-builder/
+  - directories:
+    - .cache
 
 group: edge
 
@@ -55,6 +55,8 @@ env:
   - BUILD_TYPE=flatpak FLATPAK_ARCH=x86_64
   - BUILD_TYPE=flatpak FLATPAK_ARCH=i386
 
+before_cache:
+  - tar --xattrs --xattrs-include=* -cpf .cache/cache.tar .flatpak-builder/
 
 before_install:
   - scripts/travis-build.sh before_install
@@ -63,12 +65,13 @@ install:
   - scripts/travis-build.sh install
 
 script:
+  - "mkdir -p ~/.ccache/ && touch ~/.ccache/ccache.conf"
+  - "tar --xattrs --xattrs-include=* -xf .cache/cache.tar || true"
   - scripts/travis-build.sh script
 
 after_success:
   - scripts/travis-build.sh after_success
 
-
 notifications:
   email:
     - antenore@simbiosi.org
diff --git a/flatpak/flatpak-build.sh b/flatpak/flatpak-build.sh
index b6e17eaec..36c170efc 100755
--- a/flatpak/flatpak-build.sh
+++ b/flatpak/flatpak-build.sh
@@ -14,8 +14,6 @@ flatpak_builder()
 
 FLATPAK_MANIFEST_DIR=$(dirname "$(readlink -f "$0")")
 
-mkdir -p ~/.ccache/ && touch ~/.ccache/ccache.conf
-
 cd "${FLATPAK_MANIFEST_DIR}"
 
 # Build everything but Remmina module
-- 
cgit v1.2.3


From 9114b0b2194b5203006c5530f0fb555d79593672 Mon Sep 17 00:00:00 2001
From: Antenore Gatta <antenore@simbiosi.org>
Date: Mon, 14 May 2018 22:14:48 +0200
Subject: Adding global ccache and flat_builder dir

---
 .travis.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index e59d7f480..794604ddb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -36,8 +36,11 @@ sudo: required
 language: generic
 
 cache:
-  - directories:
+  ccache: true
+  directories:
     - .cache
+    # This should be not needed. Remove if .cache is correcthly used.
+    - .flatpak-builder/
 
 group: edge
 
-- 
cgit v1.2.3