Skip to content
This repository has been archived by the owner on Mar 26, 2020. It is now read-only.

Bump dependencies version #1123

Merged
merged 3 commits into from
Aug 3, 2018
Merged

Bump dependencies version #1123

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
36b5b63
Bump up version of dep
prashanthpai Aug 1, 2018
675aa40
etcd: Bump up etcd version required to 3.3.9
prashanthpai Aug 3, 2018
4252dfc
Bump up golang version required to 1.9.x
prashanthpai Aug 1, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions extras/centos-ci.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
# if anything fails, we'll abort
set -e

REQ_GO_VERSION='1.8.3'
REQ_GO_VERSION='1.9.4'
# install Go
if ! yum -y install "golang >= $REQ_GO_VERSION"
then
Expand All @@ -24,8 +24,7 @@ yum -y install git mercurial bzr subversion gcc make
curl -o /etc/yum.repos.d/glusterfs-nighthly-master.repo http://artifacts.ci.centos.org/gluster/nightly/master.repo
yum -y install epel-release
yum -y install glusterfs-server
yum -y install ShellCheck \
etcd
yum -y install ShellCheck

export GD2SRC=$GOPATH/src/github.com/gluster/glusterd2
cd "$GD2SRC"
Expand Down
2 changes: 1 addition & 1 deletion scripts/check-go.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash

REQ_GO_MAJOR_VERSION="1"
REQ_GO_MINOR_VERSION="8"
REQ_GO_MINOR_VERSION="9"

REQ_GO_VERSION="$REQ_GO_MAJOR_VERSION.$REQ_GO_MINOR_VERSION"

Expand Down
24 changes: 23 additions & 1 deletion scripts/install-reqs.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ GOPATH=$(go env GOPATH)
GOBINDIR=$GOPATH/bin

install_dep() {
DEPVER="v0.3.1"
DEPVER="v0.5.0"
DEPURL="https://github.com/golang/dep/releases/download/${DEPVER}/dep-linux-amd64"
type dep >/dev/null 2>&1
if [ $? -eq 0 ]; then
Expand Down Expand Up @@ -39,5 +39,27 @@ install_gometalinter() {
rm -f "$GOBINDIR/$LINTER_TARBALL"
}

install_etcd() {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We'd removed this! When?

Also, @sseshasa will be bumping up etcd version in Gopkg.toml in #1068.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I"m not sure if it was present as elastic etcd was the default.

ETCD_VER="v3.3.9"
ETCD_TARBALL="etcd-${ETCD_VER}-linux-amd64.tar.gz"
ETCD_URL="https://github.com/coreos/etcd/releases/download/${ETCD_VER}/${ETCD_TARBALL}"

type etcd >/dev/null 2>&1
if [ $? -eq 0 ]; then
local version
version=$(etcd --version | awk '/^etcd Version/{print $3}')
if [[ $version == "$ETCD_VER" || $version > $ETCD_VER ]]; then
echo "etcd ${ETCD_VER} or greater is already installed"
return
fi
fi

echo "Installing etcd. Version: ${ETCD_VER}"
curl -L -o "$GOBINDIR/$ETCD_TARBALL" $ETCD_URL
tar -zxf "$GOBINDIR/$ETCD_TARBALL" --overwrite --strip-components 1 -C "$GOBINDIR" --wildcards --no-anchored {etcd,etcdctl}
rm -f "$GOBINDIR/$ETCD_TARBALL"
}

install_dep
install_gometalinter
install_etcd