From c16299bd4ec878d751633c33ba0db25e35f01e10 Mon Sep 17 00:00:00 2001
From: Andrew Hayworth <ahayworth@github.com>
Date: Mon, 28 Oct 2019 11:13:49 -0500
Subject: [PATCH 01/15] Setup CI on Actions

---
 .github/workflows/main.yml | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 .github/workflows/main.yml

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
new file mode 100644
index 00000000..71813597
--- /dev/null
+++ b/.github/workflows/main.yml
@@ -0,0 +1,16 @@
+name: CI
+on: [push]
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby-version: [2.0, 2.1, 2.2, 2.3, 2.4, 2.5, 2.6]
+    steps:
+    - name: Checkout code
+      uses: actions/checkout@v1
+    - name: Test
+      run: |
+        ruby -v
+    container:
+      image: ruby:${{matrix.ruby-version}}

From 9c77b0e51b08ec8cd40928626a5b7316d2a23c86 Mon Sep 17 00:00:00 2001
From: Andrew Hayworth <ahayworth@github.com>
Date: Mon, 28 Oct 2019 11:16:25 -0500
Subject: [PATCH 02/15] Wrap ruby versions in strings

---
 .github/workflows/main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 71813597..fb3d9e51 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -5,7 +5,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby-version: [2.0, 2.1, 2.2, 2.3, 2.4, 2.5, 2.6]
+        ruby-version: ["2.0", "2.1", "2.2", "2.3", "2.4", "2.5", "2.6"]
     steps:
     - name: Checkout code
       uses: actions/checkout@v1

From 26856dc65818fb3bc62b0c54d6a637ff583afa9d Mon Sep 17 00:00:00 2001
From: Andrew Hayworth <ahayworth@github.com>
Date: Mon, 28 Oct 2019 12:11:28 -0500
Subject: [PATCH 03/15] Port over script/cibuild

At least, I think it's a port.
---
 .github/workflows/main.yml | 77 +++++++++++++++++++++++++++++++++++---
 1 file changed, 71 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index fb3d9e51..ce9caad5 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -1,16 +1,81 @@
 name: CI
 on: [push]
 jobs:
-  build:
+  spec:
     runs-on: ubuntu-latest
     strategy:
       matrix:
         ruby-version: ["2.0", "2.1", "2.2", "2.3", "2.4", "2.5", "2.6"]
+        puppet-version: ["3.8.7", "4.10.10", "5.5.8"]
+        exclude:
+          - ruby-version: "2.0"
+            puppet-version: "4.10.10"
+          - ruby-version: "2.0"
+            puppet-version: "5.5.8"
+
+          - ruby-version: "2.1"
+            puppet-version: "5.5.8"
+
+          - ruby-version: "2.2"
+            puppet-version: "3.8.7"
+          - ruby-version: "2.2"
+            puppet-version: "5.5.8"
+
+          - ruby-version: "2.3"
+            puppet-version: "3.8.7"
+          - ruby-version: "2.3"
+            puppet-version: "5.5.8"
+
+          - ruby-version: "2.4"
+            puppet-version: "3.8.7"
+          - ruby-version: "2.4"
+            puppet-version: "4.10.10"
+
+          - ruby-version: "2.5"
+            puppet-version: "3.8.7"
+          - ruby-version: "2.5"
+            puppet-version: "4.10.10"
+
+          - ruby-version: "2.6"
+            puppet-version: "3.8.7"
+          - ruby-version: "2.6"
+            puppet-version: "4.10.10"
     steps:
-    - name: Checkout code
-      uses: actions/checkout@v1
-    - name: Test
-      run: |
-        ruby -v
+      - name: Checkout code
+        uses: actions/checkout@v1
+      - name: bundle
+        run: |
+          bundle install --jobs 4 --retry 3
+          bundle binstubs puppet rake rspec-core rubocop parallel_tests
+      - name: spec
+        run: bundle exec rake spec
     container:
       image: ruby:${{matrix.ruby-version}}
+  rubocop:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v1
+      - name: bundle
+        run: |
+          bundle install --jobs 4 --retry 3
+          bundle binstubs puppet rake rspec-core rubocop parallel_tests
+      - name: rubocop
+        run: bundle exec rake rubocop
+    container:
+      image: "ruby:2.6"
+  coverage:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v1
+      - name: bundle
+        run: |
+          bundle install --jobs 4 --retry 3
+          bundle binstubs puppet rake rspec-core rubocop parallel_tests
+      - name: rubocop
+        run: |
+          bundle exec rake coverage
+          grep -q "100% test coverage. You're all set, friend" coverage/coverage.txt
+    container:
+      image: "ruby:2.6"

From b20ad693e1791a2b85b37bc82b0988a5da7ba855 Mon Sep 17 00:00:00 2001
From: Andrew Hayworth <ahayworth@github.com>
Date: Mon, 28 Oct 2019 12:29:04 -0500
Subject: [PATCH 04/15] Change build definition and install dependencies

---
 .github/workflows/main.yml | 87 +++++++++++++++++++++++---------------
 1 file changed, 52 insertions(+), 35 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index ce9caad5..28bd4c90 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -1,56 +1,66 @@
 name: CI
 on: [push]
 jobs:
-  spec:
+  puppet-3.8.7:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby-version: ["2.0", "2.1", "2.2", "2.3", "2.4", "2.5", "2.6"]
-        puppet-version: ["3.8.7", "4.10.10", "5.5.8"]
-        exclude:
-          - ruby-version: "2.0"
-            puppet-version: "4.10.10"
-          - ruby-version: "2.0"
-            puppet-version: "5.5.8"
-
-          - ruby-version: "2.1"
-            puppet-version: "5.5.8"
-
-          - ruby-version: "2.2"
-            puppet-version: "3.8.7"
-          - ruby-version: "2.2"
-            puppet-version: "5.5.8"
-
-          - ruby-version: "2.3"
-            puppet-version: "3.8.7"
-          - ruby-version: "2.3"
-            puppet-version: "5.5.8"
-
-          - ruby-version: "2.4"
-            puppet-version: "3.8.7"
-          - ruby-version: "2.4"
-            puppet-version: "4.10.10"
-
-          - ruby-version: "2.5"
-            puppet-version: "3.8.7"
-          - ruby-version: "2.5"
-            puppet-version: "4.10.10"
+        ruby-version: ["2.0", "2.1"]
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v1
+      - name: bundle
+        run: |
+          sudo apt-get install cmake
+          bundle install --jobs 4 --retry 3
+          bundle binstubs puppet rake rspec-core rubocop parallel_tests
+      - name: rspec
+        run: bundle exec rake spec
+    container:
+      image: ruby:${{matrix.ruby-version}}
+      env:
+        PUPPET_VERSION: "3.8.7"
 
-          - ruby-version: "2.6"
-            puppet-version: "3.8.7"
-          - ruby-version: "2.6"
-            puppet-version: "4.10.10"
+  puppet-4.10.10:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby-version: ["2.1", "2.2", "2.3"]
     steps:
       - name: Checkout code
         uses: actions/checkout@v1
       - name: bundle
         run: |
+          sudo apt-get install cmake
           bundle install --jobs 4 --retry 3
           bundle binstubs puppet rake rspec-core rubocop parallel_tests
       - name: spec
+        run: bundle exec rake rspec
+    container:
+      image: ruby:${{matrix.ruby-version}}
+      env:
+        PUPPET_VERSION: "4.10.10"
+
+  puppet-5.5.8:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby-version: ["2.4", "2.5", "2.6"]
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v1
+      - name: bundle
+        run: |
+          sudo apt-get install cmake
+          bundle install --jobs 4 --retry 3
+          bundle binstubs puppet rake rspec-core rubocop parallel_tests
+      - name: rspec
         run: bundle exec rake spec
     container:
       image: ruby:${{matrix.ruby-version}}
+      env:
+        PUPPET_VERSION: "5.5.8"
+
   rubocop:
     runs-on: ubuntu-latest
     steps:
@@ -58,12 +68,16 @@ jobs:
         uses: actions/checkout@v1
       - name: bundle
         run: |
+          sudo apt-get install cmake
           bundle install --jobs 4 --retry 3
           bundle binstubs puppet rake rspec-core rubocop parallel_tests
       - name: rubocop
         run: bundle exec rake rubocop
     container:
       image: "ruby:2.6"
+      env:
+        PUPPET_VERSION: "5.5.8"
+
   coverage:
     runs-on: ubuntu-latest
     steps:
@@ -71,6 +85,7 @@ jobs:
         uses: actions/checkout@v1
       - name: bundle
         run: |
+          sudo apt-get install cmake
           bundle install --jobs 4 --retry 3
           bundle binstubs puppet rake rspec-core rubocop parallel_tests
       - name: rubocop
@@ -79,3 +94,5 @@ jobs:
           grep -q "100% test coverage. You're all set, friend" coverage/coverage.txt
     container:
       image: "ruby:2.6"
+      env:
+        PUPPET_VERSION: "5.5.8"

From 5f94d7ec4c4c8b5c1fd30ca6258036a18e2ab2a7 Mon Sep 17 00:00:00 2001
From: Andrew Hayworth <ahayworth@github.com>
Date: Mon, 28 Oct 2019 12:30:05 -0500
Subject: [PATCH 05/15] Would be nice if actions linted the config

---
 .github/workflows/main.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 28bd4c90..32e75ca1 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -1,7 +1,7 @@
 name: CI
 on: [push]
 jobs:
-  puppet-3.8.7:
+  puppet-3-8-7:
     runs-on: ubuntu-latest
     strategy:
       matrix:
@@ -21,7 +21,7 @@ jobs:
       env:
         PUPPET_VERSION: "3.8.7"
 
-  puppet-4.10.10:
+  puppet-4-10-10:
     runs-on: ubuntu-latest
     strategy:
       matrix:
@@ -41,7 +41,7 @@ jobs:
       env:
         PUPPET_VERSION: "4.10.10"
 
-  puppet-5.5.8:
+  puppet-5-5-8:
     runs-on: ubuntu-latest
     strategy:
       matrix:

From 351a239c7126e1e4c7d06c19caa1d9ece926ed6d Mon Sep 17 00:00:00 2001
From: Andrew Hayworth <ahayworth@github.com>
Date: Mon, 28 Oct 2019 12:33:59 -0500
Subject: [PATCH 06/15] Ah yes; the `run` step is in the container at this
 point

---
 .github/workflows/main.yml | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 32e75ca1..fd4c9125 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -11,7 +11,8 @@ jobs:
         uses: actions/checkout@v1
       - name: bundle
         run: |
-          sudo apt-get install cmake
+          apt-get update
+          apt-get install cmake
           bundle install --jobs 4 --retry 3
           bundle binstubs puppet rake rspec-core rubocop parallel_tests
       - name: rspec
@@ -51,7 +52,8 @@ jobs:
         uses: actions/checkout@v1
       - name: bundle
         run: |
-          sudo apt-get install cmake
+          apt-get update
+          apt-get install cmake
           bundle install --jobs 4 --retry 3
           bundle binstubs puppet rake rspec-core rubocop parallel_tests
       - name: rspec
@@ -68,7 +70,8 @@ jobs:
         uses: actions/checkout@v1
       - name: bundle
         run: |
-          sudo apt-get install cmake
+          apt-get update
+          apt-get install cmake
           bundle install --jobs 4 --retry 3
           bundle binstubs puppet rake rspec-core rubocop parallel_tests
       - name: rubocop
@@ -85,7 +88,8 @@ jobs:
         uses: actions/checkout@v1
       - name: bundle
         run: |
-          sudo apt-get install cmake
+          apt-get update
+          apt-get install cmake
           bundle install --jobs 4 --retry 3
           bundle binstubs puppet rake rspec-core rubocop parallel_tests
       - name: rubocop

From 34b78859631ea78ca53bff82c6f7e0ec12659d87 Mon Sep 17 00:00:00 2001
From: Andrew Hayworth <ahayworth@github.com>
Date: Mon, 28 Oct 2019 12:36:36 -0500
Subject: [PATCH 07/15] apt-get install -y

---
 .github/workflows/main.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index fd4c9125..77a21c19 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -12,7 +12,7 @@ jobs:
       - name: bundle
         run: |
           apt-get update
-          apt-get install cmake
+          apt-get install -y cmake
           bundle install --jobs 4 --retry 3
           bundle binstubs puppet rake rspec-core rubocop parallel_tests
       - name: rspec
@@ -32,7 +32,7 @@ jobs:
         uses: actions/checkout@v1
       - name: bundle
         run: |
-          sudo apt-get install cmake
+          sudo apt-get install -y cmake
           bundle install --jobs 4 --retry 3
           bundle binstubs puppet rake rspec-core rubocop parallel_tests
       - name: spec
@@ -53,7 +53,7 @@ jobs:
       - name: bundle
         run: |
           apt-get update
-          apt-get install cmake
+          apt-get install -y cmake
           bundle install --jobs 4 --retry 3
           bundle binstubs puppet rake rspec-core rubocop parallel_tests
       - name: rspec
@@ -71,7 +71,7 @@ jobs:
       - name: bundle
         run: |
           apt-get update
-          apt-get install cmake
+          apt-get install -y cmake
           bundle install --jobs 4 --retry 3
           bundle binstubs puppet rake rspec-core rubocop parallel_tests
       - name: rubocop
@@ -89,7 +89,7 @@ jobs:
       - name: bundle
         run: |
           apt-get update
-          apt-get install cmake
+          apt-get install -y cmake
           bundle install --jobs 4 --retry 3
           bundle binstubs puppet rake rspec-core rubocop parallel_tests
       - name: rubocop

From c7b080f1f62c205fcc438ee5b7cb32b6e69569be Mon Sep 17 00:00:00 2001
From: Andrew Hayworth <ahayworth@github.com>
Date: Mon, 28 Oct 2019 12:44:34 -0500
Subject: [PATCH 08/15] Run bundle as the bootstrap script does

---
 .github/workflows/main.yml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 77a21c19..2f230ca4 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -13,7 +13,7 @@ jobs:
         run: |
           apt-get update
           apt-get install -y cmake
-          bundle install --jobs 4 --retry 3
+          bundle install --jobs 4 --retry 3 --without='' --no-prune --path vendor/bundle --local
           bundle binstubs puppet rake rspec-core rubocop parallel_tests
       - name: rspec
         run: bundle exec rake spec
@@ -32,8 +32,8 @@ jobs:
         uses: actions/checkout@v1
       - name: bundle
         run: |
-          sudo apt-get install -y cmake
-          bundle install --jobs 4 --retry 3
+          apt-get install -y cmake
+          bundle install --jobs 4 --retry 3 --without='' --no-prune --path vendor/bundle --local
           bundle binstubs puppet rake rspec-core rubocop parallel_tests
       - name: spec
         run: bundle exec rake rspec
@@ -54,7 +54,7 @@ jobs:
         run: |
           apt-get update
           apt-get install -y cmake
-          bundle install --jobs 4 --retry 3
+          bundle install --jobs 4 --retry 3 --without='' --no-prune --path vendor/bundle --local
           bundle binstubs puppet rake rspec-core rubocop parallel_tests
       - name: rspec
         run: bundle exec rake spec
@@ -72,7 +72,7 @@ jobs:
         run: |
           apt-get update
           apt-get install -y cmake
-          bundle install --jobs 4 --retry 3
+          bundle install --jobs 4 --retry 3 --without='' --no-prune --path vendor/bundle --local
           bundle binstubs puppet rake rspec-core rubocop parallel_tests
       - name: rubocop
         run: bundle exec rake rubocop
@@ -90,7 +90,7 @@ jobs:
         run: |
           apt-get update
           apt-get install -y cmake
-          bundle install --jobs 4 --retry 3
+          bundle install --jobs 4 --retry 3 --without='' --no-prune --path vendor/bundle --local
           bundle binstubs puppet rake rspec-core rubocop parallel_tests
       - name: rubocop
         run: |

From b0ab8e045c6ecacb1d3e49f7e82cd42f105abc4a Mon Sep 17 00:00:00 2001
From: Andrew Hayworth <ahayworth@github.com>
Date: Mon, 28 Oct 2019 13:09:42 -0500
Subject: [PATCH 09/15] Try bundling the binstubs harder, this works on my
 container
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

¯\_(ツ)_/¯
---
 .github/workflows/main.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 2f230ca4..6928e440 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -14,7 +14,7 @@ jobs:
           apt-get update
           apt-get install -y cmake
           bundle install --jobs 4 --retry 3 --without='' --no-prune --path vendor/bundle --local
-          bundle binstubs puppet rake rspec-core rubocop parallel_tests
+          bundle binstubs --all --force
       - name: rspec
         run: bundle exec rake spec
     container:
@@ -34,7 +34,7 @@ jobs:
         run: |
           apt-get install -y cmake
           bundle install --jobs 4 --retry 3 --without='' --no-prune --path vendor/bundle --local
-          bundle binstubs puppet rake rspec-core rubocop parallel_tests
+          bundle binstubs --all --force
       - name: spec
         run: bundle exec rake rspec
     container:
@@ -55,7 +55,7 @@ jobs:
           apt-get update
           apt-get install -y cmake
           bundle install --jobs 4 --retry 3 --without='' --no-prune --path vendor/bundle --local
-          bundle binstubs puppet rake rspec-core rubocop parallel_tests
+          bundle binstubs --all --force
       - name: rspec
         run: bundle exec rake spec
     container:
@@ -73,7 +73,7 @@ jobs:
           apt-get update
           apt-get install -y cmake
           bundle install --jobs 4 --retry 3 --without='' --no-prune --path vendor/bundle --local
-          bundle binstubs puppet rake rspec-core rubocop parallel_tests
+          bundle binstubs --all --force
       - name: rubocop
         run: bundle exec rake rubocop
     container:
@@ -91,7 +91,7 @@ jobs:
           apt-get update
           apt-get install -y cmake
           bundle install --jobs 4 --retry 3 --without='' --no-prune --path vendor/bundle --local
-          bundle binstubs puppet rake rspec-core rubocop parallel_tests
+          bundle binstubs --all --force
       - name: rubocop
         run: |
           bundle exec rake coverage

From 5c10a327e7962083915850d3b20fb2fbd8e7ba51 Mon Sep 17 00:00:00 2001
From: Andrew Hayworth <ahayworth@github.com>
Date: Mon, 28 Oct 2019 13:13:06 -0500
Subject: [PATCH 10/15] Fix apt command

---
 .github/workflows/main.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 6928e440..dcc80ef9 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -32,6 +32,7 @@ jobs:
         uses: actions/checkout@v1
       - name: bundle
         run: |
+          apt-get update
           apt-get install -y cmake
           bundle install --jobs 4 --retry 3 --without='' --no-prune --path vendor/bundle --local
           bundle binstubs --all --force

From 638cb5915a9d48e01d498e75e59e65ca9d288816 Mon Sep 17 00:00:00 2001
From: Andrew Hayworth <ahayworth@github.com>
Date: Mon, 28 Oct 2019 13:20:56 -0500
Subject: [PATCH 11/15] Different bundler versions are annoying

---
 .github/workflows/main.yml | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index dcc80ef9..a93911cd 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -13,8 +13,7 @@ jobs:
         run: |
           apt-get update
           apt-get install -y cmake
-          bundle install --jobs 4 --retry 3 --without='' --no-prune --path vendor/bundle --local
-          bundle binstubs --all --force
+          bundle install --binstubs --jobs 4 --retry 3 --without='' --no-prune --path vendor/bundle --local
       - name: rspec
         run: bundle exec rake spec
     container:
@@ -34,8 +33,7 @@ jobs:
         run: |
           apt-get update
           apt-get install -y cmake
-          bundle install --jobs 4 --retry 3 --without='' --no-prune --path vendor/bundle --local
-          bundle binstubs --all --force
+          bundle install --binstubs --jobs 4 --retry 3 --without='' --no-prune --path vendor/bundle --local
       - name: spec
         run: bundle exec rake rspec
     container:
@@ -55,8 +53,7 @@ jobs:
         run: |
           apt-get update
           apt-get install -y cmake
-          bundle install --jobs 4 --retry 3 --without='' --no-prune --path vendor/bundle --local
-          bundle binstubs --all --force
+          bundle install --binstubs --jobs 4 --retry 3 --without='' --no-prune --path vendor/bundle --local
       - name: rspec
         run: bundle exec rake spec
     container:
@@ -73,8 +70,7 @@ jobs:
         run: |
           apt-get update
           apt-get install -y cmake
-          bundle install --jobs 4 --retry 3 --without='' --no-prune --path vendor/bundle --local
-          bundle binstubs --all --force
+          bundle install --binstubs --jobs 4 --retry 3 --without='' --no-prune --path vendor/bundle --local
       - name: rubocop
         run: bundle exec rake rubocop
     container:
@@ -91,11 +87,10 @@ jobs:
         run: |
           apt-get update
           apt-get install -y cmake
-          bundle install --jobs 4 --retry 3 --without='' --no-prune --path vendor/bundle --local
-          bundle binstubs --all --force
+          bundle install --binstubs --jobs 4 --retry 3 --without='' --no-prune --path vendor/bundle --local
       - name: rubocop
         run: |
-          bundle exec rake coverage
+          bundle exec rake coverage:all
           grep -q "100% test coverage. You're all set, friend" coverage/coverage.txt
     container:
       image: "ruby:2.6"

From bf336a7a39e0b5a6cf5b84b2c1f47c6cb8a0460e Mon Sep 17 00:00:00 2001
From: Andrew Hayworth <ahayworth@github.com>
Date: Mon, 28 Oct 2019 13:33:31 -0500
Subject: [PATCH 12/15] Add openssl libraries for rugged

---
 .github/workflows/main.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index a93911cd..eb69652f 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -12,7 +12,7 @@ jobs:
       - name: bundle
         run: |
           apt-get update
-          apt-get install -y cmake
+          apt-get install -y cmake openssl libssl-dev
           bundle install --binstubs --jobs 4 --retry 3 --without='' --no-prune --path vendor/bundle --local
       - name: rspec
         run: bundle exec rake spec
@@ -32,7 +32,7 @@ jobs:
       - name: bundle
         run: |
           apt-get update
-          apt-get install -y cmake
+          apt-get install -y cmake openssl libssl-dev
           bundle install --binstubs --jobs 4 --retry 3 --without='' --no-prune --path vendor/bundle --local
       - name: spec
         run: bundle exec rake rspec
@@ -52,7 +52,7 @@ jobs:
       - name: bundle
         run: |
           apt-get update
-          apt-get install -y cmake
+          apt-get install -y cmake openssl libssl-dev
           bundle install --binstubs --jobs 4 --retry 3 --without='' --no-prune --path vendor/bundle --local
       - name: rspec
         run: bundle exec rake spec
@@ -69,7 +69,7 @@ jobs:
       - name: bundle
         run: |
           apt-get update
-          apt-get install -y cmake
+          apt-get install -y cmake openssl libssl-dev
           bundle install --binstubs --jobs 4 --retry 3 --without='' --no-prune --path vendor/bundle --local
       - name: rubocop
         run: bundle exec rake rubocop
@@ -86,7 +86,7 @@ jobs:
       - name: bundle
         run: |
           apt-get update
-          apt-get install -y cmake
+          apt-get install -y cmake openssl libssl-dev
           bundle install --binstubs --jobs 4 --retry 3 --without='' --no-prune --path vendor/bundle --local
       - name: rubocop
         run: |

From d66e839cdbf94333b1d77864e646ba3b3fdcfbc4 Mon Sep 17 00:00:00 2001
From: Andrew Hayworth <ahayworth@github.com>
Date: Mon, 28 Oct 2019 13:36:37 -0500
Subject: [PATCH 13/15] Update main.yml

---
 .github/workflows/main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index eb69652f..0b9b88a1 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -35,7 +35,7 @@ jobs:
           apt-get install -y cmake openssl libssl-dev
           bundle install --binstubs --jobs 4 --retry 3 --without='' --no-prune --path vendor/bundle --local
       - name: spec
-        run: bundle exec rake rspec
+        run: bundle exec rake spec
     container:
       image: ruby:${{matrix.ruby-version}}
       env:

From 2d1619c0bba58ae97d5176adbee0d7c7ee82db0a Mon Sep 17 00:00:00 2001
From: Andrew Hayworth <ahayworth@github.com>
Date: Mon, 28 Oct 2019 13:48:36 -0500
Subject: [PATCH 14/15] Create a .puppet_version

---
 .github/workflows/main.yml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 0b9b88a1..24c9b3c7 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -10,9 +10,10 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v1
       - name: bundle
-        run: |
+        run: |          
           apt-get update
           apt-get install -y cmake openssl libssl-dev
+          echo "3.8.7" > .puppet_version
           bundle install --binstubs --jobs 4 --retry 3 --without='' --no-prune --path vendor/bundle --local
       - name: rspec
         run: bundle exec rake spec
@@ -33,6 +34,7 @@ jobs:
         run: |
           apt-get update
           apt-get install -y cmake openssl libssl-dev
+          echo "4.10.10" > .puppet_version
           bundle install --binstubs --jobs 4 --retry 3 --without='' --no-prune --path vendor/bundle --local
       - name: spec
         run: bundle exec rake spec
@@ -53,6 +55,7 @@ jobs:
         run: |
           apt-get update
           apt-get install -y cmake openssl libssl-dev
+          echo "5.5.8" > .puppet_version
           bundle install --binstubs --jobs 4 --retry 3 --without='' --no-prune --path vendor/bundle --local
       - name: rspec
         run: bundle exec rake spec
@@ -70,6 +73,7 @@ jobs:
         run: |
           apt-get update
           apt-get install -y cmake openssl libssl-dev
+          echo "5.5.8" > .puppet_version
           bundle install --binstubs --jobs 4 --retry 3 --without='' --no-prune --path vendor/bundle --local
       - name: rubocop
         run: bundle exec rake rubocop
@@ -87,6 +91,7 @@ jobs:
         run: |
           apt-get update
           apt-get install -y cmake openssl libssl-dev
+          echo "5.5.8" > .puppet_version
           bundle install --binstubs --jobs 4 --retry 3 --without='' --no-prune --path vendor/bundle --local
       - name: rubocop
         run: |

From 29d3c7ee974b0eb07e868ab4ca448aa9ce6e7cdb Mon Sep 17 00:00:00 2001
From: Andrew Hayworth <ahayworth@github.com>
Date: Mon, 28 Oct 2019 16:09:22 -0500
Subject: [PATCH 15/15] =?UTF-8?q?=C2=AF\=5F(=E3=83=84)=5F/=C2=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/main.yml | 25 ++++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 24c9b3c7..390502fd 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -14,9 +14,11 @@ jobs:
           apt-get update
           apt-get install -y cmake openssl libssl-dev
           echo "3.8.7" > .puppet_version
-          bundle install --binstubs --jobs 4 --retry 3 --without='' --no-prune --path vendor/bundle --local
+          bundle install --binstubs --jobs 4 --retry 3
       - name: rspec
-        run: bundle exec rake spec
+        run: |
+          bundle exec rspec spec/octocatalog-diff/tests
+          bundle exec rspec spec/octocatalog-diff/integration
     container:
       image: ruby:${{matrix.ruby-version}}
       env:
@@ -35,9 +37,11 @@ jobs:
           apt-get update
           apt-get install -y cmake openssl libssl-dev
           echo "4.10.10" > .puppet_version
-          bundle install --binstubs --jobs 4 --retry 3 --without='' --no-prune --path vendor/bundle --local
+          bundle install --binstubs --jobs 4 --retry 3
       - name: spec
-        run: bundle exec rake spec
+        run: |
+          bundle exec rspec spec/octocatalog-diff/tests
+          bundle exec rspec spec/octocatalog-diff/integration
     container:
       image: ruby:${{matrix.ruby-version}}
       env:
@@ -56,9 +60,11 @@ jobs:
           apt-get update
           apt-get install -y cmake openssl libssl-dev
           echo "5.5.8" > .puppet_version
-          bundle install --binstubs --jobs 4 --retry 3 --without='' --no-prune --path vendor/bundle --local
+          bundle install --binstubs --jobs 4 --retry 3
       - name: rspec
-        run: bundle exec rake spec
+        run: |
+          bundle exec rspec spec/octocatalog-diff/tests
+          bundle exec rspec spec/octocatalog-diff/integration
     container:
       image: ruby:${{matrix.ruby-version}}
       env:
@@ -74,7 +80,7 @@ jobs:
           apt-get update
           apt-get install -y cmake openssl libssl-dev
           echo "5.5.8" > .puppet_version
-          bundle install --binstubs --jobs 4 --retry 3 --without='' --no-prune --path vendor/bundle --local
+          bundle install --binstubs --jobs 4 --retry 3
       - name: rubocop
         run: bundle exec rake rubocop
     container:
@@ -92,12 +98,13 @@ jobs:
           apt-get update
           apt-get install -y cmake openssl libssl-dev
           echo "5.5.8" > .puppet_version
-          bundle install --binstubs --jobs 4 --retry 3 --without='' --no-prune --path vendor/bundle --local
+          bundle install --binstubs --jobs 4 --retry 3
       - name: rubocop
         run: |
-          bundle exec rake coverage:all
+          bundle exec rspec spec/octocatalog-diff/tests
           grep -q "100% test coverage. You're all set, friend" coverage/coverage.txt
     container:
       image: "ruby:2.6"
       env:
         PUPPET_VERSION: "5.5.8"
+        COVERAGE: true