Refactor Actions CI jobs and add Puppet 7 / Ruby 3

Author: ahayworth

.github/workflows/main.yml

@@ -1,80 +1,40 @@
 name: CI
 on: [push, pull_request, workflow_dispatch]
 jobs:
-  puppet-3-8-7:
-    env:
-      PUPPET_VERSIONS: "3.8.7"
-      PUPPET_VERSION: "3.8.7"
-      RUBOCOP_TEST: false
-      RSPEC_TEST: true
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        ruby-version: ["2.0", "2.1"]
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v1
-      - name: Build container
-        run: docker build . --file Dockerfile --tag octocatalog-diff:ruby${{matrix.ruby-version}} --build-arg RUBY_VERSION=${{matrix.ruby-version}}
-      - name: Tests
-        run: docker run -e PUPPET_VERSION -e PUPPET_VERSIONS -e RSPEC_TEST -e RUBOCOP_TEST -e ENFORCE_COVERAGE octocatalog-diff:ruby${{matrix.ruby-version}} /app/script/cibuild
-
-  puppet-4-10-10:
-    env:
-      PUPPET_VERSIONS: "4.10.10"
-      PUPPET_VERSION: "4.10.10"
-      RUBOCOP_TEST: false
-      RSPEC_TEST: true
+  rspec:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby-version: ["2.1", "2.2", "2.3"]
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v1
-      - name: Build container
-        run: docker build . --file Dockerfile --tag octocatalog-diff:ruby${{matrix.ruby-version}} --build-arg RUBY_VERSION=${{matrix.ruby-version}}
-      - name: Tests
-        run: docker run -e PUPPET_VERSION -e PUPPET_VERSIONS -e RSPEC_TEST -e RUBOCOP_TEST -e ENFORCE_COVERAGE octocatalog-diff:ruby${{matrix.ruby-version}} /app/script/cibuild
-
-  puppet-5-5-8:
+        include:
+          - { puppet-version: "3.8.7",   ruby-version: "2.0", docker-tag: "" }
+          - { puppet-version: "3.8.7",   ruby-version: "2.1", docker-tag: "" }
+          - { puppet-version: "4.10.10", ruby-version: "2.1", docker-tag: "" }
+          - { puppet-version: "4.10.10", ruby-version: "2.2", docker-tag: "" }
+          - { puppet-version: "4.10.10", ruby-version: "2.3", docker-tag: "" }
+          - { puppet-version: "5.5.22",  ruby-version: "2.4", docker-tag: "-stretch" }
+          - { puppet-version: "5.5.22",  ruby-version: "2.5", docker-tag: "-stretch" }
+          - { puppet-version: "5.5.22",  ruby-version: "2.6", docker-tag: "-stretch" }
+          - { puppet-version: "6.20.0",  ruby-version: "2.5", docker-tag: "-stretch" }
+          - { puppet-version: "6.20.0",  ruby-version: "2.6", docker-tag: "-stretch" }
+          - { puppet-version: "7.3.0",   ruby-version: "2.5", docker-tag: "-stretch" }
+          - { puppet-version: "7.3.0",   ruby-version: "2.6", docker-tag: "-stretch" }
+          - { puppet-version: "7.3.0",   ruby-version: "2.7", docker-tag: "-buster"  }
+          - { puppet-version: "7.3.0",   ruby-version: "3.0", docker-tag: "-buster"  }
     env:
-      PUPPET_VERSIONS: "5.5.8"
-      PUPPET_VERSION: "5.5.8"
-      RUBOCOP_TEST: false
       RSPEC_TEST: true
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        ruby-version: ["2.4", "2.5", "2.6"]
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v1
-      - name: Build container
-        run: docker build . --file Dockerfile --tag octocatalog-diff:ruby${{matrix.ruby-version}} --build-arg RUBY_VERSION=${{matrix.ruby-version}}-stretch
-      - name: Tests
-        run: docker run -e PUPPET_VERSION -e PUPPET_VERSIONS -e RSPEC_TEST -e RUBOCOP_TEST -e ENFORCE_COVERAGE octocatalog-diff:ruby${{matrix.ruby-version}} /app/script/cibuild
-
-  puppet-6-18-0:
-    env:
-      PUPPET_VERSIONS: "6.18.0"
-      PUPPET_VERSION: "6.18.0"
+      PUPPET_VERSION: ${{matrix.puppet-version }}
+      PUPPET_VERSIONS: ${{matrix.puppet-version }}
       RUBOCOP_TEST: false
-      RSPEC_TEST: true
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        ruby-version: ["2.5", "2.6"]
     steps:
       - name: Checkout code
         uses: actions/checkout@v1
       - name: Build container
-        run: docker build . --file Dockerfile --tag octocatalog-diff:ruby${{matrix.ruby-version}} --build-arg RUBY_VERSION=${{matrix.ruby-version}}-stretch
+        run: docker build . --file Dockerfile --tag octocatalog-diff:ruby${{matrix.ruby-version}} --build-arg RUBY_VERSION=${{matrix.ruby-version}}${{matrix.docker-tag}}
       - name: Tests
         run: docker run -e PUPPET_VERSION -e PUPPET_VERSIONS -e RSPEC_TEST -e RUBOCOP_TEST -e ENFORCE_COVERAGE octocatalog-diff:ruby${{matrix.ruby-version}} /app/script/cibuild
       - name: Rubocop and Coverage
         run: docker run -e PUPPET_VERSION -e PUPPET_VERSIONS -e RSPEC_TEST -e RUBOCOP_TEST -e ENFORCE_COVERAGE octocatalog-diff:ruby${{matrix.ruby-version}} /app/script/cibuild
-        if: matrix.ruby-version == '2.6'
+        if: matrix.ruby-version == '2.6' && matrix.puppet-version == '5.5.22'
         env:
           RUBOCOP_TEST: true
           ENFORCE_COVERAGE: true