From ec3ca0430af4690f59ed04028f787215ff7a1c10 Mon Sep 17 00:00:00 2001
From: Geert Janssens <geert@kobaltwit.be>
Date: Fri, 26 Jan 2018 17:39:25 +0100
Subject: [PATCH] Fix test-cashflow-barchart.scm for guile 2.2

At the same time enable guile 2.2 for our arch ci test
so gnucash gets ci testing with that version as well
---
 gnucash/report/report-system/html-barchart.scm                  | 2 +-
 gnucash/report/standard-reports/test/test-cashflow-barchart.scm | 2 ++
 util/ci/arch-docker                                             | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/gnucash/report/report-system/html-barchart.scm b/gnucash/report/report-system/html-barchart.scm
index 6ef3c2d5f4..75ef17e133 100644
--- a/gnucash/report/report-system/html-barchart.scm
+++ b/gnucash/report/report-system/html-barchart.scm
@@ -452,7 +452,7 @@
                    },
                    series: series,
                    axesDefaults: {
-                   },        
+                   },
                    grid: {
                    },
                    axes: {
diff --git a/gnucash/report/standard-reports/test/test-cashflow-barchart.scm b/gnucash/report/standard-reports/test/test-cashflow-barchart.scm
index 12cfd5bba3..156f48f1b1 100644
--- a/gnucash/report/standard-reports/test/test-cashflow-barchart.scm
+++ b/gnucash/report/standard-reports/test/test-cashflow-barchart.scm
@@ -35,6 +35,8 @@
 (use-modules (ice-9 streams))
 (use-modules (srfi srfi-1))
 
+;; Explicitly set locale to make the report output predictable
+(setlocale LC_ALL "C")
 
 (define (run-test)
   (logging-and (test-in-txn)
diff --git a/util/ci/arch-docker b/util/ci/arch-docker
index dc5c947a89..e870796bda 100644
--- a/util/ci/arch-docker
+++ b/util/ci/arch-docker
@@ -1,5 +1,5 @@
 from base/archlinux
-run pacman -Syu --quiet --noconfirm gcc cmake make boost python2 pkg-config guile2.0 guile git ninja gtest gmock sqlite3 webkit2gtk swig gwenhywfar aqbanking intltool libxslt postgresql-libs libmariadbclient libdbi libdbi-drivers > /dev/null
+run pacman -Syu --quiet --noconfirm gcc cmake make boost python2 pkg-config guile git ninja gtest gmock sqlite3 webkit2gtk swig gwenhywfar aqbanking intltool libxslt postgresql-libs libmariadbclient libdbi libdbi-drivers > /dev/null
 run echo en_US.UTF-8 UTF-8 >> /etc/locale.gen
 run echo en_GB.UTF-8 UTF-8 >> /etc/locale.gen
 run echo fr_FR.UTF-8 UTF-8 >> /etc/locale.gen