From dc121ca13e085f0df3f5b3c264a692b4dc0be0d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lo=C3=AFc=20Hoguin?= <essen@ninenines.eu>
Date: Thu, 26 Apr 2018 11:44:06 +0200
Subject: Install go/glide on all environments

---
 alpine.sh    |  3 ++-
 archlinux.sh |  3 ++-
 centos.sh    |  4 +++-
 ci.d/yum     | 16 +++++++++++-----
 debian.sh    |  3 ++-
 ubuntu.sh    |  3 ++-
 6 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/alpine.sh b/alpine.sh
index cdc4976..e159b50 100755
--- a/alpine.sh
+++ b/alpine.sh
@@ -8,7 +8,8 @@ DIST=alpine
 RELEASE=edge
 ARCH=amd64
 PACKAGES="pcre ca-certificates openssl-dev ncurses-dev zlib-dev \
-	openssh bash curl zsh vim sudo erlang git build-base autoconf gawk"
+	openssh bash curl zsh vim sudo erlang git build-base autoconf gawk \
+	go glide"
 
 for f in ci.d/*; do source "$f"; done
 
diff --git a/archlinux.sh b/archlinux.sh
index 4db1a8b..1aa8a59 100755
--- a/archlinux.sh
+++ b/archlinux.sh
@@ -7,7 +7,8 @@ NAME=$1
 DIST=archlinux
 RELEASE=current
 ARCH=amd64
-PACKAGES="cronie openssh openssl-1.0 zsh vim sudo erlang-nox git make autoconf automake gcc"
+PACKAGES="cronie openssh openssl-1.0 zsh vim sudo erlang-nox git make \
+	autoconf automake gcc go glide"
 
 for f in ci.d/*; do source "$f"; done
 
diff --git a/centos.sh b/centos.sh
index c2ff9a0..a2cd5b0 100755
--- a/centos.sh
+++ b/centos.sh
@@ -9,7 +9,8 @@ RELEASE=7
 ARCH=amd64
 # We don't install Erlang because it's complicated on CentOS.
 # We will instead use the Erlang versions built with kerl.
-PACKAGES="curl ncurses-devel openssl-devel zsh vim sudo git make autoconf automake gcc"
+PACKAGES="curl ncurses-devel openssl-devel zsh vim sudo git make \
+	autoconf automake gcc golang glide"
 
 for f in ci.d/*; do source "$f"; done
 
@@ -18,6 +19,7 @@ lxc_destroy
 lxc_create $DIST $RELEASE $ARCH
 lxc_wait_for_ip
 yum_upgrade
+yum_install_epel
 yum_install $PACKAGES
 buildkite_install $DIST $BUILDKITE_TOKEN
 ssh_copy_host_key
diff --git a/ci.d/yum b/ci.d/yum
index 961ecf9..d5a63ba 100644
--- a/ci.d/yum
+++ b/ci.d/yum
@@ -1,11 +1,17 @@
 #!/usr/bin/env sh
 
-# yum_upgrade
-yum_upgrade() {
-	lxc_do yum update
-}
-
 # yum_install $PACKAGES
 yum_install() {
 	lxc_do yum install -y "$@"
 }
+
+# yum_install_epel
+yum_install_epel() {
+	lxc_do curl -O http://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm
+	lxc_do rpm -ivh epel-release-latest-7.noarch.rpm
+}
+
+# yum_upgrade
+yum_upgrade() {
+	lxc_do yum update
+}
diff --git a/debian.sh b/debian.sh
index 6c920de..711edc5 100755
--- a/debian.sh
+++ b/debian.sh
@@ -8,7 +8,8 @@ DIST=debian
 RELEASE=stretch
 ARCH=amd64
 PACKAGES="gnupg apt-transport-https curl libssl1.0-dev libncurses5-dev \
-	zsh vim sudo erlang-nox git make autoconf automake gcc"
+	zsh vim sudo erlang-nox git make autoconf automake gcc \
+	golang golang-glide"
 
 for f in ci.d/*; do source "$f"; done
 
diff --git a/ubuntu.sh b/ubuntu.sh
index 5328113..eb73802 100755
--- a/ubuntu.sh
+++ b/ubuntu.sh
@@ -7,7 +7,8 @@ NAME=$1
 DIST=ubuntu
 RELEASE=artful
 ARCH=amd64
-PACKAGES="curl libssl-dev libncurses5-dev zsh vim sudo erlang-nox git make autoconf automake gcc"
+PACKAGES="curl libssl-dev libncurses5-dev zsh vim sudo erlang-nox git \
+	make autoconf automake gcc golang golang-glide"
 
 for f in ci.d/*; do source "$f"; done
 
-- 
cgit v1.2.3