From 4d75130afdaf0bb21d5a21198833bcb2e3ba9ab6 Mon Sep 17 00:00:00 2001
From: Jake Howard <git@theorangeone.net>
Date: Mon, 15 Jun 2020 13:06:38 +0100
Subject: [PATCH] Unify CI config into 1 file

---
 .github/workflows/{ansible.yml => ci.yml} | 17 +++++++++++++++--
 .github/workflows/terraform.yml           | 17 -----------------
 README.md                                 |  3 +--
 3 files changed, 16 insertions(+), 21 deletions(-)
 rename .github/workflows/{ansible.yml => ci.yml} (57%)
 delete mode 100644 .github/workflows/terraform.yml

diff --git a/.github/workflows/ansible.yml b/.github/workflows/ci.yml
similarity index 57%
rename from .github/workflows/ansible.yml
rename to .github/workflows/ci.yml
index 1218eaa..2b48310 100644
--- a/.github/workflows/ansible.yml
+++ b/.github/workflows/ci.yml
@@ -1,9 +1,9 @@
-name: Ansible
+name: CI
 
 on: [push]
 
 jobs:
-  build:
+  ansible:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v1
@@ -19,3 +19,16 @@ jobs:
         run: ./scripts/ansible/setup.sh
       - name: Run linters
         run: ./scripts/ansible/lint.sh
+
+  terraform:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v1
+      - name: Install terraform
+        uses: marocchino/setup-terraform@v1
+        with:
+          version: "0.12.20"
+      - name: Initialize Terraform
+        run: ./scripts/terraform/terraform.sh init -backend=false
+      - name: Lint
+        run: ./scripts/terraform/lint.sh
diff --git a/.github/workflows/terraform.yml b/.github/workflows/terraform.yml
deleted file mode 100644
index 9321688..0000000
--- a/.github/workflows/terraform.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-name: Terraform
-
-on: [push]
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v1
-      - name: Install terraform
-        uses: marocchino/setup-terraform@v1
-        with:
-          version: "0.12.20"
-      - name: Initialize Terraform
-        run: ./scripts/terraform/terraform.sh init -backend=false
-      - name: Lint
-        run: ./scripts/terraform/lint.sh
diff --git a/README.md b/README.md
index 9e00a4f..c79ea77 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,6 @@
 # Infrastructure
 
-![Ansible Status](https://github.com/realorangeone/infrastructure/workflows/Ansible/badge.svg)
-![Terraform Status](https://github.com/realorangeone/infrastructure/workflows/Terraform/badge.svg)
+![CI Status](https://github.com/realorangeone/infrastructure/workflows/CI/badge.svg)
 
 ## Requirements