From d4aeccde2655f7828881b0de7f3885a5fd5243b0 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Tue, 3 Nov 2020 09:58:34 -0600
Subject: [PATCH] Issue #202: Separate linting into separate job and run in
 correct folder.

---
 .github/workflows/ci.yml | 37 ++++++++++++++++++++++++++++++++-----
 1 file changed, 32 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index d4a5897..f8dd209 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -8,14 +8,40 @@ name: CI
   schedule:
     - cron: "0 5 * * 0"
 
+defaults:
+  run:
+    working-directory: 'geerlingguy.apache'
+
 jobs:
 
-  test:
+  lint:
+    name: Lint
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out the codebase.
+        uses: actions/checkout@v2
+        with:
+          path: 'geerlingguy.apache'
+
+      - name: Set up Python 3.
+        uses: actions/setup-python@v2
+        with:
+          python-version: '3.x'
+
+      - name: Install test dependencies.
+        run: pip3 install yamllint ansible-lint
+
+      - name: Lint code.
+        run: |
+          yamllint .
+          ansible-lint
+
+  molecule:
     name: Molecule
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        MOLECULE_DISTRO:
+        distro:
           - centos8
           - centos7
           - ubuntu2004
@@ -33,12 +59,13 @@ jobs:
           python-version: '3.x'
 
       - name: Install test dependencies.
-        run: pip3 install molecule[docker] yamllint ansible-lint
+        run: pip3 install molecule[docker]
 
       - name: Run Molecule tests.
-        run: molecule test
+        run: |
+          cd molecule
+          molecule test
         env:
           PY_COLORS: '1'
           ANSIBLE_FORCE_COLOR: '1'
           MOLECULE_DISTRO: ${{ matrix.distro }}
-        working-directory: molecule