From b4de8fd4aeb04721fe08647708cdade838670453 Mon Sep 17 00:00:00 2001
From: Jeremy Soller <jackpot51@gmail.com>
Date: Sat, 8 Apr 2017 16:43:00 -0600
Subject: [PATCH] Update ci to use update-packages, fix update-packages by
using fetch
---
ci.sh | 3 +--
update-packages.sh | 2 +-
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/ci.sh b/ci.sh
index dc70f68d1..8bd2878bc 100755
--- a/ci.sh
+++ b/ci.sh
@@ -2,6 +2,5 @@
set -e
-./all.sh distclean
-./all.sh dist
+./update-packages.sh
./all.sh publish
diff --git a/update-packages.sh b/update-packages.sh
index 6a3aba2f9..56ec7559f 100755
--- a/update-packages.sh
+++ b/update-packages.sh
@@ -17,7 +17,7 @@ do
./cook.sh $recipe dist
else
oldver=$(./cook.sh $recipe gitversion)
- ./cook.sh $recipe update
+ ./cook.sh $recipe fetch
newver=$(./cook.sh $recipe gitversion)
if [ "$oldver" = "$newver" ]
then
--
GitLab