From 32c6bad5d52db4d1bb293f756bcaac4f829624be Mon Sep 17 00:00:00 2001
From: David Hummel <dhummel@Fingerling>
Date: Tue, 17 Aug 2021 23:22:00 -0700
Subject: [PATCH] Allow tests to run again

---
 .github/actions/apt/provision/action.yml      | 13 -----------
 .github/actions/yum/provision/action.yml      | 22 -------------------
 .github/workflows/build-and-test-centos-7.yml | 10 +++++++--
 .../workflows/build-and-test-fedora-34.yml    |  7 ++++--
 .../workflows/build-and-test-ubuntu-20-04.yml |  2 +-
 .github/workflows/lint.yml                    |  2 +-
 6 files changed, 15 insertions(+), 41 deletions(-)
 delete mode 100644 .github/actions/apt/provision/action.yml
 delete mode 100644 .github/actions/yum/provision/action.yml

diff --git a/.github/actions/apt/provision/action.yml b/.github/actions/apt/provision/action.yml
deleted file mode 100644
index 89df0559..00000000
--- a/.github/actions/apt/provision/action.yml
+++ /dev/null
@@ -1,13 +0,0 @@
----
-inputs:
-  packages:
-    description: List of package(s) to install
-    required: true
-
-runs:
-  using: composite
-  steps:
-    - name: Install package(s)
-      uses: ./.github/actions/apt/install
-      with:
-        packages: ${{ inputs.packages }}
diff --git a/.github/actions/yum/provision/action.yml b/.github/actions/yum/provision/action.yml
deleted file mode 100644
index 67a4087f..00000000
--- a/.github/actions/yum/provision/action.yml
+++ /dev/null
@@ -1,22 +0,0 @@
----
-inputs:
-  groups:
-    description: List of group(s) to install
-    required: false
-    default: >-
-      "Development Tools"
-  packages:
-    description: List of package(s) to install
-    required: true
-
-runs:
-  using: composite
-  steps:
-    - name: Install group(s)
-      uses: ./.github/actions/yum/groups-install
-      with:
-        groups: ${{ inputs.groups }}
-    - name: Install package(s)
-      uses: ./.github/actions/yum/install
-      with:
-        packages: ${{ inputs.packages }}
diff --git a/.github/workflows/build-and-test-centos-7.yml b/.github/workflows/build-and-test-centos-7.yml
index c1fdb663..3b403731 100644
--- a/.github/workflows/build-and-test-centos-7.yml
+++ b/.github/workflows/build-and-test-centos-7.yml
@@ -8,6 +8,8 @@ on:
       - distros/centos-7
 
 env:
+  build-group-dependencies: >-
+    "Development Tools"
   build-dependencies: >-
     boost169-devel
     cairo-devel
@@ -47,8 +49,12 @@ jobs:
         uses: ./.github/actions/yum/install
         with:
           packages: epel-release
-      - name: Provision environment
-        uses: ./.github/actions/yum/provision
+      - name: Provision environment (groups)
+        uses: ./.github/actions/yum/groups-install
+        with:
+          groups: ${{ env.build-group-dependencies }}
+      - name: Provision environment (packages)
+        uses: ./.github/actions/yum/install
         with:
           packages: ${{ env.build-dependencies }}
       - name: Cache "Download `Mapnik`" & "Build & Install `Mapnik`"
diff --git a/.github/workflows/build-and-test-fedora-34.yml b/.github/workflows/build-and-test-fedora-34.yml
index 20fab363..539907e6 100644
--- a/.github/workflows/build-and-test-fedora-34.yml
+++ b/.github/workflows/build-and-test-fedora-34.yml
@@ -33,10 +33,13 @@ jobs:
     steps:
       - name: Checkout code
         uses: actions/checkout@v2
-      - name: Provision environment
-        uses: ./.github/actions/yum/provision
+      - name: Provision environment (groups)
+        uses: ./.github/actions/yum/groups-install
         with:
           groups: ${{ env.build-group-dependencies }}
+      - name: Provision environment (packages)
+        uses: ./.github/actions/yum/install
+        with:
           packages: ${{ env.build-dependencies }} httpd
       - name: Run `./autogen.sh`
         run: ./autogen.sh
diff --git a/.github/workflows/build-and-test-ubuntu-20-04.yml b/.github/workflows/build-and-test-ubuntu-20-04.yml
index d6678b63..d9350704 100644
--- a/.github/workflows/build-and-test-ubuntu-20-04.yml
+++ b/.github/workflows/build-and-test-ubuntu-20-04.yml
@@ -28,7 +28,7 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v2
       - name: Provision environment
-        uses: ./.github/actions/apt/provision
+        uses: ./.github/actions/apt/install
         with:
           packages: >-
             ${{ env.build-dependencies }}
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index e56f5ce9..85b7cffd 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -16,7 +16,7 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v2
       - name: Provision environment
-        uses: ./.github/actions/apt/provision
+        uses: ./.github/actions/apt/install
         with:
           packages: astyle
       - name: Run `astyle`