From c438eb4994017d4ad29101313a10c89aa39114eb Mon Sep 17 00:00:00 2001 From: imshashank Date: Wed, 26 Jul 2017 11:36:26 -0700 Subject: [PATCH 01/25] Tests on different distros using docker --- .travis.yml | 11 +++++++++++ docker-run.sh | 28 ++++++++++++++++++++++++++++ 2 files changed, 39 insertions(+) create mode 100755 docker-run.sh diff --git a/.travis.yml b/.travis.yml index 2593798..1527c81 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,3 +1,6 @@ +services: + - docker + language: bash before_install: @@ -6,3 +9,11 @@ before_install: script: - make test +- docker run -it -v $PWD/docker-run.sh:/run.sh -e 'GIT_VER=1:2.7.4-0ubuntu1' -e 'BASH_VER=4.0' ubuntu /run.sh +- docker run -it -v $PWD/docker-run.sh:/run.sh -e 'GIT_VER=1:2.7.4-0ubuntu1' -e 'BASH_VER=4.0' ubuntu:14.04 /run.sh +- docker run -it -v $PWD/docker-run.sh:/run.sh -e 'BASH_VER=4.0' centos /run.sh + +after_script: +- docker run -it -v $PWD/docker-run.sh:/run.sh -e 'GIT_VER=1:2.7.4-0ubuntu1' -e 'BASH_VER=3.0' ubuntu /run.sh +- docker run -it -v $PWD/docker-run.sh:/run.sh -e 'GIT_VER=1:2.7.4-0ubuntu1' -e 'BASH_VER=3.0' ubuntu:14.04 /run.sh +- docker run -it -v $PWD/docker-run.sh:/run.sh -e 'BASH_VER=4.0' centos /run.sh diff --git a/docker-run.sh b/docker-run.sh new file mode 100755 index 0000000..0d7bdf8 --- /dev/null +++ b/docker-run.sh @@ -0,0 +1,28 @@ +#!/usr/bin/env bash + +set -e + +if [ -f /etc/debian_version ]; then + apt-get -y update + apt-get -y install gcc wget + apt-get -y install make git=$GIT_VER +elif [ -f /etc/redhat-release ]; then + yum -y update + yum -y install make git gcc wget +fi + +wget https://ftp.gnu.org/gnu/bash/bash-$BASH_VER.tar.gz +tar -xvf bash* +cd bash-$BASH_VER +./configure --prefix=/usr \ + --bindir=/bin \ + --without-bash-malloc \ + --with-installed-readline +make +make install + +# Clone git-secrets, install and run tests. +git clone https://github.com/awslabs/git-secrets.git +cd git-secrets +make install +make test From 1515a31f16d538f09e157ccf871335392ed97126 Mon Sep 17 00:00:00 2001 From: imshashank Date: Thu, 27 Jul 2017 13:29:20 -0700 Subject: [PATCH 02/25] Update git version for ubuntu 14.04 --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1527c81..a8e3c95 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,10 +10,10 @@ before_install: script: - make test - docker run -it -v $PWD/docker-run.sh:/run.sh -e 'GIT_VER=1:2.7.4-0ubuntu1' -e 'BASH_VER=4.0' ubuntu /run.sh -- docker run -it -v $PWD/docker-run.sh:/run.sh -e 'GIT_VER=1:2.7.4-0ubuntu1' -e 'BASH_VER=4.0' ubuntu:14.04 /run.sh +- docker run -it -v $PWD/docker-run.sh:/run.sh -e 'GIT_VER=1:1.9.1-1ubuntu0.5' -e 'BASH_VER=4.0' ubuntu:14.04 /run.sh - docker run -it -v $PWD/docker-run.sh:/run.sh -e 'BASH_VER=4.0' centos /run.sh after_script: - docker run -it -v $PWD/docker-run.sh:/run.sh -e 'GIT_VER=1:2.7.4-0ubuntu1' -e 'BASH_VER=3.0' ubuntu /run.sh -- docker run -it -v $PWD/docker-run.sh:/run.sh -e 'GIT_VER=1:2.7.4-0ubuntu1' -e 'BASH_VER=3.0' ubuntu:14.04 /run.sh +- docker run -it -v $PWD/docker-run.sh:/run.sh -e 'GIT_VER=1:1.9.1-1ubuntu0.5' -e 'BASH_VER=3.0' ubuntu:14.04 /run.sh - docker run -it -v $PWD/docker-run.sh:/run.sh -e 'BASH_VER=4.0' centos /run.sh From 46f9528f3c2ffe79a28bb9142a7b97fe730eafaa Mon Sep 17 00:00:00 2001 From: imshashank Date: Fri, 28 Jul 2017 15:14:47 -0700 Subject: [PATCH 03/25] Make scripts less verbose to reduce logs --- .travis.yml | 2 -- docker-run.sh | 25 ++++++++++++++----------- 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/.travis.yml b/.travis.yml index a8e3c95..e68b595 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,8 +12,6 @@ script: - docker run -it -v $PWD/docker-run.sh:/run.sh -e 'GIT_VER=1:2.7.4-0ubuntu1' -e 'BASH_VER=4.0' ubuntu /run.sh - docker run -it -v $PWD/docker-run.sh:/run.sh -e 'GIT_VER=1:1.9.1-1ubuntu0.5' -e 'BASH_VER=4.0' ubuntu:14.04 /run.sh - docker run -it -v $PWD/docker-run.sh:/run.sh -e 'BASH_VER=4.0' centos /run.sh - -after_script: - docker run -it -v $PWD/docker-run.sh:/run.sh -e 'GIT_VER=1:2.7.4-0ubuntu1' -e 'BASH_VER=3.0' ubuntu /run.sh - docker run -it -v $PWD/docker-run.sh:/run.sh -e 'GIT_VER=1:1.9.1-1ubuntu0.5' -e 'BASH_VER=3.0' ubuntu:14.04 /run.sh - docker run -it -v $PWD/docker-run.sh:/run.sh -e 'BASH_VER=4.0' centos /run.sh diff --git a/docker-run.sh b/docker-run.sh index 0d7bdf8..3a8369d 100755 --- a/docker-run.sh +++ b/docker-run.sh @@ -3,26 +3,29 @@ set -e if [ -f /etc/debian_version ]; then - apt-get -y update - apt-get -y install gcc wget - apt-get -y install make git=$GIT_VER + apt-get -y -q update + echo "Installing gcc wget make git=$GIT_VER" + apt-get -y -qq install gcc wget make git=$GIT_VER elif [ -f /etc/redhat-release ]; then - yum -y update - yum -y install make git gcc wget + echo "Updating yum" + yum -y -q update + echo "Installing gcc wget make git" + yum -y -q install make git gcc wget fi wget https://ftp.gnu.org/gnu/bash/bash-$BASH_VER.tar.gz -tar -xvf bash* +tar -zxf bash-$BASH_VER.tar.gz cd bash-$BASH_VER ./configure --prefix=/usr \ --bindir=/bin \ --without-bash-malloc \ - --with-installed-readline -make -make install + --with-installed-readline \ + --quiet +make -s +make -s install # Clone git-secrets, install and run tests. git clone https://github.com/awslabs/git-secrets.git cd git-secrets -make install -make test +make -s install +make -s test From 32474c6a0b46a47c9c383b0e567c61fcbbf538e8 Mon Sep 17 00:00:00 2001 From: imshashank Date: Fri, 28 Jul 2017 15:22:48 -0700 Subject: [PATCH 04/25] Send output to dev/null --- docker-run.sh | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/docker-run.sh b/docker-run.sh index 3a8369d..1ab1972 100755 --- a/docker-run.sh +++ b/docker-run.sh @@ -3,14 +3,15 @@ set -e if [ -f /etc/debian_version ]; then - apt-get -y -q update + echo "Updating apt-get" + apt-get -qq -y update echo "Installing gcc wget make git=$GIT_VER" - apt-get -y -qq install gcc wget make git=$GIT_VER + apt-get -y install gcc wget make git=$GIT_VER > /dev/null elif [ -f /etc/redhat-release ]; then echo "Updating yum" - yum -y -q update + yum -q -y update echo "Installing gcc wget make git" - yum -y -q install make git gcc wget + yum -y install make git gcc wget > /dev/null fi wget https://ftp.gnu.org/gnu/bash/bash-$BASH_VER.tar.gz From 948e51ce28512badf9ba9abc1ae113f31f05dadb Mon Sep 17 00:00:00 2001 From: shashank agarwal Date: Mon, 4 Sep 2017 14:18:48 -0700 Subject: [PATCH 05/25] Update .travis.yml `https://github.com/sstephenson/bats` is failing tests when run on Bash v3.00.0. --- .travis.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index e68b595..34618fb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,6 +12,8 @@ script: - docker run -it -v $PWD/docker-run.sh:/run.sh -e 'GIT_VER=1:2.7.4-0ubuntu1' -e 'BASH_VER=4.0' ubuntu /run.sh - docker run -it -v $PWD/docker-run.sh:/run.sh -e 'GIT_VER=1:1.9.1-1ubuntu0.5' -e 'BASH_VER=4.0' ubuntu:14.04 /run.sh - docker run -it -v $PWD/docker-run.sh:/run.sh -e 'BASH_VER=4.0' centos /run.sh +- docker run -it -v $PWD/docker-run.sh:/run.sh -e 'BASH_VER=4.0' centos /run.sh + +allow_failures: - docker run -it -v $PWD/docker-run.sh:/run.sh -e 'GIT_VER=1:2.7.4-0ubuntu1' -e 'BASH_VER=3.0' ubuntu /run.sh - docker run -it -v $PWD/docker-run.sh:/run.sh -e 'GIT_VER=1:1.9.1-1ubuntu0.5' -e 'BASH_VER=3.0' ubuntu:14.04 /run.sh -- docker run -it -v $PWD/docker-run.sh:/run.sh -e 'BASH_VER=4.0' centos /run.sh From 2ad5f649c4480d2534200998430810d51660a16e Mon Sep 17 00:00:00 2001 From: shashank agarwal Date: Mon, 4 Sep 2017 14:44:10 -0700 Subject: [PATCH 06/25] Update .travis.yml --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 34618fb..0846ab5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,10 +10,10 @@ before_install: script: - make test - docker run -it -v $PWD/docker-run.sh:/run.sh -e 'GIT_VER=1:2.7.4-0ubuntu1' -e 'BASH_VER=4.0' ubuntu /run.sh -- docker run -it -v $PWD/docker-run.sh:/run.sh -e 'GIT_VER=1:1.9.1-1ubuntu0.5' -e 'BASH_VER=4.0' ubuntu:14.04 /run.sh +- docker run -it -v $PWD/docker-run.sh:/run.sh -e 'GIT_VER=1:1.9.1-1ubuntu0.6' -e 'BASH_VER=4.0' ubuntu:14.04 /run.sh - docker run -it -v $PWD/docker-run.sh:/run.sh -e 'BASH_VER=4.0' centos /run.sh - docker run -it -v $PWD/docker-run.sh:/run.sh -e 'BASH_VER=4.0' centos /run.sh allow_failures: - docker run -it -v $PWD/docker-run.sh:/run.sh -e 'GIT_VER=1:2.7.4-0ubuntu1' -e 'BASH_VER=3.0' ubuntu /run.sh -- docker run -it -v $PWD/docker-run.sh:/run.sh -e 'GIT_VER=1:1.9.1-1ubuntu0.5' -e 'BASH_VER=3.0' ubuntu:14.04 /run.sh +- docker run -it -v $PWD/docker-run.sh:/run.sh -e 'GIT_VER=1:1.9.1-1ubuntu0.6' -e 'BASH_VER=3.0' ubuntu:14.04 /run.sh From 15e9e3b7bd3fa08a05819440a7ddd167b42d38be Mon Sep 17 00:00:00 2001 From: shashank agarwal Date: Mon, 4 Sep 2017 14:59:28 -0700 Subject: [PATCH 07/25] Update .travis.yml --- .travis.yml | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0846ab5..85b871e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,16 +4,23 @@ services: language: bash before_install: -- git config --global user.email "you@example.com" -- git config --global user.name "Your Name" +- git config --global user.email "awslabs@amazon.com" +- git config --global user.name "Awslabs" + +matrix: + include: + - env: BASH_VER=4.0 + - env: GIT_VER=1:2.7.4-0ubuntu1 + env: BASH_VER=4.0 + - env: GIT_VER=1:1.9.1-1ubuntu0.6 + env: BASH_VER=4.0 + + allow_failures: + - env: GIT_VER=1:2.7.4-0ubuntu1 + env: BASH_VER=3.0 + - env: GIT_VER=1:1.9.1-1ubuntu0.6 + env: BASH_VER=3.0 script: - make test -- docker run -it -v $PWD/docker-run.sh:/run.sh -e 'GIT_VER=1:2.7.4-0ubuntu1' -e 'BASH_VER=4.0' ubuntu /run.sh -- docker run -it -v $PWD/docker-run.sh:/run.sh -e 'GIT_VER=1:1.9.1-1ubuntu0.6' -e 'BASH_VER=4.0' ubuntu:14.04 /run.sh -- docker run -it -v $PWD/docker-run.sh:/run.sh -e 'BASH_VER=4.0' centos /run.sh -- docker run -it -v $PWD/docker-run.sh:/run.sh -e 'BASH_VER=4.0' centos /run.sh - -allow_failures: -- docker run -it -v $PWD/docker-run.sh:/run.sh -e 'GIT_VER=1:2.7.4-0ubuntu1' -e 'BASH_VER=3.0' ubuntu /run.sh -- docker run -it -v $PWD/docker-run.sh:/run.sh -e 'GIT_VER=1:1.9.1-1ubuntu0.6' -e 'BASH_VER=3.0' ubuntu:14.04 /run.sh +- docker run -it -v $PWD/docker-run.sh:/run.sh ubuntu /run.sh From c184f6cb62db8416cb71911f4178c80194e89269 Mon Sep 17 00:00:00 2001 From: shashank agarwal Date: Mon, 4 Sep 2017 15:01:05 -0700 Subject: [PATCH 08/25] Clean travis yml --- .travis.yml | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index 85b871e..14fe1fd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,16 +10,12 @@ before_install: matrix: include: - env: BASH_VER=4.0 - - env: GIT_VER=1:2.7.4-0ubuntu1 - env: BASH_VER=4.0 - - env: GIT_VER=1:1.9.1-1ubuntu0.6 - env: BASH_VER=4.0 + - env: GIT_VER=1:2.7.4-0ubuntu1 BASH_VER=4.0 + - env: GIT_VER=1:1.9.1-1ubuntu0.6 BASH_VER=4.0 allow_failures: - - env: GIT_VER=1:2.7.4-0ubuntu1 - env: BASH_VER=3.0 - - env: GIT_VER=1:1.9.1-1ubuntu0.6 - env: BASH_VER=3.0 + - env: GIT_VER=1:2.7.4-0ubuntu1 BASH_VER=3.0 + - env: GIT_VER=1:1.9.1-1ubuntu0.6 BASH_VER=3.0 script: - make test From 1fdee255fc93806bc1830d23e93357a540f1cc39 Mon Sep 17 00:00:00 2001 From: shashank agarwal Date: Mon, 4 Sep 2017 15:06:51 -0700 Subject: [PATCH 09/25] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 14fe1fd..3b83070 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,4 +19,4 @@ matrix: script: - make test -- docker run -it -v $PWD/docker-run.sh:/run.sh ubuntu /run.sh +- docker run -it -v $PWD/docker-run.sh:/run.sh -e "GIT_VER=$GIT_VER" -e "BASH_VER=$BASH_VER" ubuntu /run.sh From 8f642705d3d836dfb0b5ab980bb36c5807f538bd Mon Sep 17 00:00:00 2001 From: shashank agarwal Date: Mon, 4 Sep 2017 15:07:54 -0700 Subject: [PATCH 10/25] Update .travis.yml --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 3b83070..1d7def5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,7 +12,6 @@ matrix: - env: BASH_VER=4.0 - env: GIT_VER=1:2.7.4-0ubuntu1 BASH_VER=4.0 - env: GIT_VER=1:1.9.1-1ubuntu0.6 BASH_VER=4.0 - allow_failures: - env: GIT_VER=1:2.7.4-0ubuntu1 BASH_VER=3.0 - env: GIT_VER=1:1.9.1-1ubuntu0.6 BASH_VER=3.0 From d0d07befdf5bcf4cd16f35388a4cc40bda590b06 Mon Sep 17 00:00:00 2001 From: shashank agarwal Date: Mon, 4 Sep 2017 15:08:24 -0700 Subject: [PATCH 11/25] Update .travis.yml --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 1d7def5..80e4317 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,5 +17,4 @@ matrix: - env: GIT_VER=1:1.9.1-1ubuntu0.6 BASH_VER=3.0 script: -- make test - docker run -it -v $PWD/docker-run.sh:/run.sh -e "GIT_VER=$GIT_VER" -e "BASH_VER=$BASH_VER" ubuntu /run.sh From 4354e862f1f44a95782190494f6c88a074acee7c Mon Sep 17 00:00:00 2001 From: shashank agarwal Date: Mon, 4 Sep 2017 15:16:21 -0700 Subject: [PATCH 12/25] Add check for variable GIT_VER --- docker-run.sh | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/docker-run.sh b/docker-run.sh index 1ab1972..949e764 100755 --- a/docker-run.sh +++ b/docker-run.sh @@ -2,11 +2,17 @@ set -e +GIT_CMD="git" + +if [ -z ${GIT_VER+x} ]; then + GIT_CMD='git='$GIT_VER +fi + if [ -f /etc/debian_version ]; then echo "Updating apt-get" apt-get -qq -y update - echo "Installing gcc wget make git=$GIT_VER" - apt-get -y install gcc wget make git=$GIT_VER > /dev/null + echo "Installing gcc wget make $GIT_CMD" + apt-get -y install gcc wget make $GIT_CMD > /dev/null elif [ -f /etc/redhat-release ]; then echo "Updating yum" yum -q -y update @@ -25,6 +31,7 @@ cd bash-$BASH_VER make -s make -s install +cd / # Clone git-secrets, install and run tests. git clone https://github.com/awslabs/git-secrets.git cd git-secrets From 67dcc2d86e0a939cd894c53a745395f3193cc7af Mon Sep 17 00:00:00 2001 From: shashank agarwal Date: Mon, 4 Sep 2017 15:20:33 -0700 Subject: [PATCH 13/25] Update docker-run.sh --- docker-run.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docker-run.sh b/docker-run.sh index 949e764..787e161 100755 --- a/docker-run.sh +++ b/docker-run.sh @@ -2,10 +2,10 @@ set -e -GIT_CMD="git" - if [ -z ${GIT_VER+x} ]; then - GIT_CMD='git='$GIT_VER + GIT_CMD="git" +else + GIT_CMD="git=$GIT_VER" fi if [ -f /etc/debian_version ]; then From c7ec99681019b3ff6220251726cc6dac03aa9e22 Mon Sep 17 00:00:00 2001 From: shashank agarwal Date: Mon, 4 Sep 2017 15:32:38 -0700 Subject: [PATCH 14/25] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 80e4317..7e2b9f9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,4 +17,4 @@ matrix: - env: GIT_VER=1:1.9.1-1ubuntu0.6 BASH_VER=3.0 script: -- docker run -it -v $PWD/docker-run.sh:/run.sh -e "GIT_VER=$GIT_VER" -e "BASH_VER=$BASH_VER" ubuntu /run.sh +- docker run -it -v $PWD/docker-run.sh:/run.sh -e "GIT_VER=$GIT_VER" -e "BASH_VER=$BASH_VER" ubuntu:14.04 /run.sh From 7feddfdf9dcced98d1fb1a246cb86c9f2c5c2c9e Mon Sep 17 00:00:00 2001 From: shashank agarwal Date: Mon, 4 Sep 2017 15:54:39 -0700 Subject: [PATCH 15/25] Update .travis.yml --- .travis.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7e2b9f9..0410694 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,3 +1,4 @@ + services: - docker @@ -9,12 +10,11 @@ before_install: matrix: include: - - env: BASH_VER=4.0 - - env: GIT_VER=1:2.7.4-0ubuntu1 BASH_VER=4.0 - - env: GIT_VER=1:1.9.1-1ubuntu0.6 BASH_VER=4.0 + - env: GIT_VER=1.0.0 BASH_VER=4.0 DOCKER_BUILD_IMAGE=ubuntu:14.04 + - env: GIT_VER=2.0.0 BASH_VER=4.0 DOCKER_BUILD_IMAGE=ubuntu:14.04 allow_failures: - - env: GIT_VER=1:2.7.4-0ubuntu1 BASH_VER=3.0 - - env: GIT_VER=1:1.9.1-1ubuntu0.6 BASH_VER=3.0 + - env: GIT_VER=1.0.0 BASH_VER=3.0 DOCKER_BUILD_IMAGE=ubuntu:14.04 + - env: GIT_VER=2.0.0 BASH_VER=3.0 DOCKER_BUILD_IMAGE=ubuntu:14.04 script: -- docker run -it -v $PWD/docker-run.sh:/run.sh -e "GIT_VER=$GIT_VER" -e "BASH_VER=$BASH_VER" ubuntu:14.04 /run.sh +- docker run -it -v $PWD/docker-run.sh:/run.sh -e "GIT_VER=$GIT_VER" -e "BASH_VER=$BASH_VER" $DOCKER_BUILD_IMAGE /run.sh From 17cfff8de5162744c299fa23355aa87d3ac5094b Mon Sep 17 00:00:00 2001 From: shashank agarwal Date: Mon, 4 Sep 2017 15:54:49 -0700 Subject: [PATCH 16/25] Update docker-run.sh --- docker-run.sh | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/docker-run.sh b/docker-run.sh index 787e161..4312476 100755 --- a/docker-run.sh +++ b/docker-run.sh @@ -11,15 +11,29 @@ fi if [ -f /etc/debian_version ]; then echo "Updating apt-get" apt-get -qq -y update - echo "Installing gcc wget make $GIT_CMD" - apt-get -y install gcc wget make $GIT_CMD > /dev/null + echo "Installing gcc wget make" + apt-get -y install gcc wget make > /dev/null + apt-get -y install dh-autoreconf libcurl4-gnutls-dev libexpat1-dev gettext libz-dev libssl-dev + elif [ -f /etc/redhat-release ]; then echo "Updating yum" yum -q -y update - echo "Installing gcc wget make git" - yum -y install make git gcc wget > /dev/null + echo "Installing gcc wget make" + dnf -y install dh-autoreconf curl-devel expat-devel gettext-devel openssl-devel perl-devel zlib-devel + yum -y install make gcc wget > /dev/null + ln -s /usr/bin/db2x_docbook2texi /usr/bin/docbook2x-texi fi +# Install git from source +wget https://www.kernel.org/pub/software/scm/git/git-$GIT_VER.tar.gz +tar -zxf git-$GIT_VER.tar.gz +cd git-$GIT_VER +make -s configure +./configure --prefix=/usr --quiet +make -s all +make -s install + +# Install bash from source wget https://ftp.gnu.org/gnu/bash/bash-$BASH_VER.tar.gz tar -zxf bash-$BASH_VER.tar.gz cd bash-$BASH_VER From 9a3f7a6aee07996b8ab95a007e7831307001700b Mon Sep 17 00:00:00 2001 From: shashank agarwal Date: Mon, 4 Sep 2017 16:00:40 -0700 Subject: [PATCH 17/25] Update .travis.yml --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0410694..dc2376a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,10 +10,10 @@ before_install: matrix: include: - - env: GIT_VER=1.0.0 BASH_VER=4.0 DOCKER_BUILD_IMAGE=ubuntu:14.04 + - env: GIT_VER=1.8.0 BASH_VER=4.0 DOCKER_BUILD_IMAGE=ubuntu:14.04 - env: GIT_VER=2.0.0 BASH_VER=4.0 DOCKER_BUILD_IMAGE=ubuntu:14.04 allow_failures: - - env: GIT_VER=1.0.0 BASH_VER=3.0 DOCKER_BUILD_IMAGE=ubuntu:14.04 + - env: GIT_VER=1.8.0 BASH_VER=3.0 DOCKER_BUILD_IMAGE=ubuntu:14.04 - env: GIT_VER=2.0.0 BASH_VER=3.0 DOCKER_BUILD_IMAGE=ubuntu:14.04 script: From dacfc3e84cf900dd7b27ba6a638facf1d9cd0138 Mon Sep 17 00:00:00 2001 From: shashank agarwal Date: Mon, 4 Sep 2017 16:03:59 -0700 Subject: [PATCH 18/25] Update .travis.yml --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index dc2376a..b72add4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,10 +10,10 @@ before_install: matrix: include: - - env: GIT_VER=1.8.0 BASH_VER=4.0 DOCKER_BUILD_IMAGE=ubuntu:14.04 + - env: GIT_VER=1.9.0 BASH_VER=4.0 DOCKER_BUILD_IMAGE=ubuntu:14.04 - env: GIT_VER=2.0.0 BASH_VER=4.0 DOCKER_BUILD_IMAGE=ubuntu:14.04 allow_failures: - - env: GIT_VER=1.8.0 BASH_VER=3.0 DOCKER_BUILD_IMAGE=ubuntu:14.04 + - env: GIT_VER=1.9.0 BASH_VER=3.0 DOCKER_BUILD_IMAGE=ubuntu:14.04 - env: GIT_VER=2.0.0 BASH_VER=3.0 DOCKER_BUILD_IMAGE=ubuntu:14.04 script: From 6c50ce96f18f4e57f0f397708eb37d7d85be3e08 Mon Sep 17 00:00:00 2001 From: shashank agarwal Date: Mon, 4 Sep 2017 16:04:08 -0700 Subject: [PATCH 19/25] Update docker-run.sh --- docker-run.sh | 6 ------ 1 file changed, 6 deletions(-) diff --git a/docker-run.sh b/docker-run.sh index 4312476..07d3606 100755 --- a/docker-run.sh +++ b/docker-run.sh @@ -2,12 +2,6 @@ set -e -if [ -z ${GIT_VER+x} ]; then - GIT_CMD="git" -else - GIT_CMD="git=$GIT_VER" -fi - if [ -f /etc/debian_version ]; then echo "Updating apt-get" apt-get -qq -y update From b5466b873535544a90eb1e2381035f2f130a6f3d Mon Sep 17 00:00:00 2001 From: shashank agarwal Date: Mon, 4 Sep 2017 16:15:18 -0700 Subject: [PATCH 20/25] Update .travis.yml --- .travis.yml | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index b72add4..afab4c1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,3 @@ - services: - docker @@ -8,13 +7,18 @@ before_install: - git config --global user.email "awslabs@amazon.com" - git config --global user.name "Awslabs" +env: + matrix: include: - - env: GIT_VER=1.9.0 BASH_VER=4.0 DOCKER_BUILD_IMAGE=ubuntu:14.04 + - env: GIT_VER=1.8.0 BASH_VER=4.0 DOCKER_BUILD_IMAGE=ubuntu:14.04 - env: GIT_VER=2.0.0 BASH_VER=4.0 DOCKER_BUILD_IMAGE=ubuntu:14.04 + - env: GIT_VER=1.8.0 BASH_VER=3.0 DOCKER_BUILD_IMAGE=ubuntu:14.04 + - env: GIT_VER=2.0.0 BASH_VER=3.0 DOCKER_BUILD_IMAGE=ubuntu:14.04 allow_failures: - - env: GIT_VER=1.9.0 BASH_VER=3.0 DOCKER_BUILD_IMAGE=ubuntu:14.04 + - env: GIT_VER=1.8.0 BASH_VER=3.0 DOCKER_BUILD_IMAGE=ubuntu:14.04 - env: GIT_VER=2.0.0 BASH_VER=3.0 DOCKER_BUILD_IMAGE=ubuntu:14.04 + fast_finish: true script: - docker run -it -v $PWD/docker-run.sh:/run.sh -e "GIT_VER=$GIT_VER" -e "BASH_VER=$BASH_VER" $DOCKER_BUILD_IMAGE /run.sh From 047ea5867246ab48e2e3c1bfe5daeba34b470998 Mon Sep 17 00:00:00 2001 From: shashank agarwal Date: Mon, 4 Sep 2017 16:16:27 -0700 Subject: [PATCH 21/25] Update .travis.yml --- .travis.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index afab4c1..8aa4f4e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,8 +7,6 @@ before_install: - git config --global user.email "awslabs@amazon.com" - git config --global user.name "Awslabs" -env: - matrix: include: - env: GIT_VER=1.8.0 BASH_VER=4.0 DOCKER_BUILD_IMAGE=ubuntu:14.04 From 77562c056c2c6df90408c53601eaeecaaebc79c1 Mon Sep 17 00:00:00 2001 From: shashank agarwal Date: Mon, 4 Sep 2017 16:19:40 -0700 Subject: [PATCH 22/25] Update .travis.yml --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8aa4f4e..888dae1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,12 +9,12 @@ before_install: matrix: include: - - env: GIT_VER=1.8.0 BASH_VER=4.0 DOCKER_BUILD_IMAGE=ubuntu:14.04 + - env: GIT_VER=1.9.0 BASH_VER=4.0 DOCKER_BUILD_IMAGE=ubuntu:14.04 - env: GIT_VER=2.0.0 BASH_VER=4.0 DOCKER_BUILD_IMAGE=ubuntu:14.04 - - env: GIT_VER=1.8.0 BASH_VER=3.0 DOCKER_BUILD_IMAGE=ubuntu:14.04 + - env: GIT_VER=1.9.0 BASH_VER=3.0 DOCKER_BUILD_IMAGE=ubuntu:14.04 - env: GIT_VER=2.0.0 BASH_VER=3.0 DOCKER_BUILD_IMAGE=ubuntu:14.04 allow_failures: - - env: GIT_VER=1.8.0 BASH_VER=3.0 DOCKER_BUILD_IMAGE=ubuntu:14.04 + - env: GIT_VER=1.9.0 BASH_VER=3.0 DOCKER_BUILD_IMAGE=ubuntu:14.04 - env: GIT_VER=2.0.0 BASH_VER=3.0 DOCKER_BUILD_IMAGE=ubuntu:14.04 fast_finish: true From 7c2357448cdab3bb8870aa1e5f8021383d187460 Mon Sep 17 00:00:00 2001 From: shashank agarwal Date: Mon, 4 Sep 2017 16:35:31 -0700 Subject: [PATCH 23/25] Add support for redhat architecture --- docker-run.sh | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/docker-run.sh b/docker-run.sh index 07d3606..e30f444 100755 --- a/docker-run.sh +++ b/docker-run.sh @@ -7,18 +7,21 @@ if [ -f /etc/debian_version ]; then apt-get -qq -y update echo "Installing gcc wget make" apt-get -y install gcc wget make > /dev/null - apt-get -y install dh-autoreconf libcurl4-gnutls-dev libexpat1-dev gettext libz-dev libssl-dev + echo "Installing dh-autoreconf libcurl4-gnutls-dev libexpat1-dev gettext libz-dev libssl-dev" + apt-get -y install dh-autoreconf libcurl4-gnutls-dev libexpat1-dev gettext libz-dev libssl-dev > /dev/null elif [ -f /etc/redhat-release ]; then echo "Updating yum" yum -q -y update - echo "Installing gcc wget make" - dnf -y install dh-autoreconf curl-devel expat-devel gettext-devel openssl-devel perl-devel zlib-devel - yum -y install make gcc wget > /dev/null + echo "Installing make gcc wget epel-release dnf" + yum -y install make gcc wget epel-release dnf > /dev/null + echo "Installing dh-autoreconf curl-devel expat-devel gettext-devel openssl-devel perl-devel zlib-devel" + dnf -y install dh-autoreconf curl-devel expat-devel gettext-devel openssl-devel perl-devel zlib-devel > /dev/null ln -s /usr/bin/db2x_docbook2texi /usr/bin/docbook2x-texi fi # Install git from source +echo "Downloading git $GIT_VER and building from source" wget https://www.kernel.org/pub/software/scm/git/git-$GIT_VER.tar.gz tar -zxf git-$GIT_VER.tar.gz cd git-$GIT_VER @@ -28,6 +31,8 @@ make -s all make -s install # Install bash from source +echo "Downloading bash $BASH_VER and building from source" +cd / wget https://ftp.gnu.org/gnu/bash/bash-$BASH_VER.tar.gz tar -zxf bash-$BASH_VER.tar.gz cd bash-$BASH_VER @@ -39,8 +44,8 @@ cd bash-$BASH_VER make -s make -s install -cd / # Clone git-secrets, install and run tests. +cd / git clone https://github.com/awslabs/git-secrets.git cd git-secrets make -s install From de2dc7baf802f6e6542b3bbd93bdae901092856c Mon Sep 17 00:00:00 2001 From: shashank agarwal Date: Mon, 4 Sep 2017 16:35:54 -0700 Subject: [PATCH 24/25] Add centos7 build environment --- .travis.yml | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 888dae1..e57c571 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,3 +1,4 @@ + services: - docker @@ -9,13 +10,19 @@ before_install: matrix: include: - - env: GIT_VER=1.9.0 BASH_VER=4.0 DOCKER_BUILD_IMAGE=ubuntu:14.04 - - env: GIT_VER=2.0.0 BASH_VER=4.0 DOCKER_BUILD_IMAGE=ubuntu:14.04 - env: GIT_VER=1.9.0 BASH_VER=3.0 DOCKER_BUILD_IMAGE=ubuntu:14.04 - env: GIT_VER=2.0.0 BASH_VER=3.0 DOCKER_BUILD_IMAGE=ubuntu:14.04 + - env: GIT_VER=1.9.0 BASH_VER=4.0 DOCKER_BUILD_IMAGE=ubuntu:14.04 + - env: GIT_VER=2.0.0 BASH_VER=4.0 DOCKER_BUILD_IMAGE=ubuntu:14.04 + - env: GIT_VER=1.9.0 BASH_VER=3.0 DOCKER_BUILD_IMAGE=centos:centos7 + - env: GIT_VER=2.0.0 BASH_VER=3.0 DOCKER_BUILD_IMAGE=centos:centos7 + - env: GIT_VER=1.9.0 BASH_VER=4.0 DOCKER_BUILD_IMAGE=centos:centos7 + - env: GIT_VER=2.0.0 BASH_VER=4.0 DOCKER_BUILD_IMAGE=centos:centos7 allow_failures: - env: GIT_VER=1.9.0 BASH_VER=3.0 DOCKER_BUILD_IMAGE=ubuntu:14.04 - env: GIT_VER=2.0.0 BASH_VER=3.0 DOCKER_BUILD_IMAGE=ubuntu:14.04 + - env: GIT_VER=1.9.0 BASH_VER=3.0 DOCKER_BUILD_IMAGE=centos:centos7 + - env: GIT_VER=2.0.0 BASH_VER=3.0 DOCKER_BUILD_IMAGE=centos:centos7 fast_finish: true script: From 3df38f337c6d3dcea241086cf30dbc918dee0034 Mon Sep 17 00:00:00 2001 From: shashank agarwal Date: Mon, 4 Sep 2017 16:48:13 -0700 Subject: [PATCH 25/25] Update docker-run.sh --- docker-run.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docker-run.sh b/docker-run.sh index e30f444..98f7b2e 100755 --- a/docker-run.sh +++ b/docker-run.sh @@ -14,7 +14,8 @@ elif [ -f /etc/redhat-release ]; then echo "Updating yum" yum -q -y update echo "Installing make gcc wget epel-release dnf" - yum -y install make gcc wget epel-release dnf > /dev/null + yum -y install make gcc wget epel-release > /dev/null + yum -y install dnf > /dev/null echo "Installing dh-autoreconf curl-devel expat-devel gettext-devel openssl-devel perl-devel zlib-devel" dnf -y install dh-autoreconf curl-devel expat-devel gettext-devel openssl-devel perl-devel zlib-devel > /dev/null ln -s /usr/bin/db2x_docbook2texi /usr/bin/docbook2x-texi