From 1be32ff09af0a7044dafa2384febe0134818969c Mon Sep 17 00:00:00 2001
From: Casey Faist <caseylfaist@gmail.com>
Date: Thu, 4 Oct 2018 11:45:41 -0500
Subject: [PATCH 1/6] add more unblocking setup

---
 .gitignore | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.gitignore b/.gitignore
index a08e2c1..da8ab48 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,6 @@ site
 
 /.envrc
 repos/*
+
+#Venv
+buildpack/*

From 576def4cde81cdbc4cae4fb3e0004f076ff5b87b Mon Sep 17 00:00:00 2001
From: Casey Faist <caseylfaist@gmail.com>
Date: Thu, 4 Oct 2018 10:22:55 -0500
Subject: [PATCH 2/6] fix travis dependency blocker

---
 .travis.yml     | 1 +
 etc/ci-setup.sh | 3 +++
 2 files changed, 4 insertions(+)
 create mode 100644 etc/ci-setup.sh

diff --git a/.travis.yml b/.travis.yml
index 9bdc47a..c11dc71 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,6 +3,7 @@ dist: trusty
 rvm:
 - 2.4.4
 before_script:
+  - bash etc/ci-setup.sh
   - gem install bundler -v 1.16.2
   - bundle exec rake hatchet:setup_travis
 addons:
diff --git a/etc/ci-setup.sh b/etc/ci-setup.sh
new file mode 100644
index 0000000..75bb97e
--- /dev/null
+++ b/etc/ci-setup.sh
@@ -0,0 +1,3 @@
+sudo apt-get -qq update
+sudo apt-get install software-properties-common -y
+curl --fail --retry 3 --retry-delay 1 --connect-timeout 3 --max-time 30 https://cli-assets.heroku.com/install-ubuntu.sh | sh
\ No newline at end of file

From 882f54128b8c5cbe2c31dda2f954c72c2dc016c3 Mon Sep 17 00:00:00 2001
From: Casey Faist <caseylfaist@gmail.com>
Date: Thu, 4 Oct 2018 10:37:44 -0500
Subject: [PATCH 3/6] rememer to remove toolbelt

---
 .travis.yml | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index c11dc71..d7c58db 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,12 +6,6 @@ before_script:
   - bash etc/ci-setup.sh
   - gem install bundler -v 1.16.2
   - bundle exec rake hatchet:setup_travis
-addons:
-  apt:
-    sources:
-    - heroku
-    packages:
-    - heroku-toolbelt
 jobs:
   include:
   - stage: Bash linting (shellcheck)

From 8c36a3a263fb44af3a576a0f981774c8359d5580 Mon Sep 17 00:00:00 2001
From: Casey Faist <caseylfaist@gmail.com>
Date: Thu, 4 Oct 2018 10:44:25 -0500
Subject: [PATCH 4/6] move heroku install to before_install

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index d7c58db..1dc88e9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,7 +3,6 @@ dist: trusty
 rvm:
 - 2.4.4
 before_script:
-  - bash etc/ci-setup.sh
   - gem install bundler -v 1.16.2
   - bundle exec rake hatchet:setup_travis
 jobs:
@@ -11,6 +10,7 @@ jobs:
   - stage: Bash linting (shellcheck)
     sudo: false
     before_install:
+    - bash etc/ci-setup.sh
     - wget -c https://goo.gl/ZzKHFv -O - | tar -xvJ -C /tmp/
     - PATH="/tmp/shellcheck-latest:$PATH"
     script: make check

From 50a3d2d13e9a72d8f1bbcda12408eb881e081781 Mon Sep 17 00:00:00 2001
From: Casey Faist <caseylfaist@gmail.com>
Date: Thu, 4 Oct 2018 10:47:16 -0500
Subject: [PATCH 5/6] add shebang and update file permissions

---
 etc/ci-setup.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
 mode change 100644 => 100755 etc/ci-setup.sh

diff --git a/etc/ci-setup.sh b/etc/ci-setup.sh
old mode 100644
new mode 100755
index 75bb97e..bcc9f18
--- a/etc/ci-setup.sh
+++ b/etc/ci-setup.sh
@@ -1,3 +1,5 @@
+#!/usr/bin/env bash
+
 sudo apt-get -qq update
 sudo apt-get install software-properties-common -y
-curl --fail --retry 3 --retry-delay 1 --connect-timeout 3 --max-time 30 https://cli-assets.heroku.com/install-ubuntu.sh | sh
\ No newline at end of file
+curl --fail --retry 3 --retry-delay 1 --connect-timeout 3 --max-time 30 https://cli-assets.heroku.com/install-ubuntu.sh | sh

From 4778b1cb9dab1a9f5991768e600483c149bb4858 Mon Sep 17 00:00:00 2001
From: Casey Faist <caseylfaist@gmail.com>
Date: Thu, 4 Oct 2018 11:34:50 -0500
Subject: [PATCH 6/6] add sudo to travis install

---
 .travis.yml     | 4 +++-
 etc/ci-setup.sh | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 1dc88e9..9fc974a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,16 +1,18 @@
 language: ruby
 dist: trusty
+sudo: required
 rvm:
 - 2.4.4
 before_script:
   - gem install bundler -v 1.16.2
   - bundle exec rake hatchet:setup_travis
+before_install:
+  - sudo bash etc/ci-setup.sh
 jobs:
   include:
   - stage: Bash linting (shellcheck)
     sudo: false
     before_install:
-    - bash etc/ci-setup.sh
     - wget -c https://goo.gl/ZzKHFv -O - | tar -xvJ -C /tmp/
     - PATH="/tmp/shellcheck-latest:$PATH"
     script: make check
diff --git a/etc/ci-setup.sh b/etc/ci-setup.sh
index bcc9f18..a6a957e 100755
--- a/etc/ci-setup.sh
+++ b/etc/ci-setup.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
 
 sudo apt-get -qq update
-sudo apt-get install software-properties-common -y
+sudo apt-get install software-properties-common
 curl --fail --retry 3 --retry-delay 1 --connect-timeout 3 --max-time 30 https://cli-assets.heroku.com/install-ubuntu.sh | sh