From 404f66c95ce1de02b41ead28412e027bb9db7d80 Mon Sep 17 00:00:00 2001
From: Renato Silva <br.renatosilva@gmail.com>
Date: Sat, 25 Jun 2016 10:34:34 -0300
Subject: [PATCH] CI: Fix saneman installation and update.

---
 ci-build.sh   | 7 ++-----
 ci-library.sh | 7 +++++++
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/ci-build.sh b/ci-build.sh
index 986ea72a..1a34000a 100644
--- a/ci-build.sh
+++ b/ci-build.sh
@@ -20,13 +20,10 @@ message 'Processing changes' "${commits[@]}"
 test -z "${packages}" && success 'No changes in package recipes'
 define_build_order || failure 'Could not determine build order'
 
-# Quality
-message 'Checking recipe quality'
-check_recipe_quality || failure 'Could not pass quality check'
-
 # Build
 message 'Building packages' "${packages[@]}"
-execute 'Upgrading the system' pacman --noconfirm --noprogressbar --sync --refresh --refresh --sysupgrade --sysupgrade
+execute 'Updating system' update_system
+execute 'Approving recipe quality' check_recipe_quality
 for package in "${packages[@]}"; do
     execute 'Building binary' makepkg --noconfirm --noprogressbar --skippgpcheck --nocheck --syncdeps --rmdeps --cleanbuild
     execute 'Building source' makepkg --noconfirm --noprogressbar --skippgpcheck --allsource
diff --git a/ci-library.sh b/ci-library.sh
index 34781299..404b1943 100644
--- a/ci-library.sh
+++ b/ci-library.sh
@@ -129,6 +129,13 @@ execute(){
     cd - > /dev/null
 }
 
+# Update system
+update_system() {
+    repman add ci.msys 'https://dl.bintray.com/alexpux/msys2' || return 1
+    pacman --noconfirm --noprogressbar --sync --refresh --refresh --sysupgrade --sysupgrade || return 1
+    pacman --noconfirm --noprogressbar --sync ci.msys/pactoys
+}
+
 # Sort packages by dependency
 define_build_order() {
     local sorted_packages=()