From fef116f2acfa17f0117bc271f331e931f42a0986 Mon Sep 17 00:00:00 2001
From: Kendell R <KTibow@users.noreply.github.com>
Date: Wed, 4 Nov 2020 18:28:09 -0800
Subject: [PATCH] Improve GitHub Actions

Closes #15, see https://github.com/KTibow/ha-blueprint#readme
---
 .github/workflows/combined.yaml | 30 ++++++++++++++++++++++++++++++
 .github/workflows/validate.yaml | 18 ------------------
 2 files changed, 30 insertions(+), 18 deletions(-)
 create mode 100644 .github/workflows/combined.yaml
 delete mode 100644 .github/workflows/validate.yaml

diff --git a/.github/workflows/combined.yaml b/.github/workflows/combined.yaml
new file mode 100644
index 0000000..5d4d046
--- /dev/null
+++ b/.github/workflows/combined.yaml
@@ -0,0 +1,30 @@
+name: "Validation And Formatting"
+on:
+  push:
+  pull_request:
+  schedule:
+    - cron: '0 0 * * *'
+jobs:
+  ci:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+        name: Download repo
+        with:
+          fetch-depth: 0
+      - uses: actions/setup-python@v2
+        name: Setup Python
+      - uses: actions/cache@v2
+        name: Cache
+        with:
+          path: |
+            ~/.cache/pip
+          key: custom-component-ci
+      - uses: hacs/integration/action@main
+        with:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          CATEGORY: integration
+      - uses: KTibow/ha-blueprint@stable
+        name: CI
+        with:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/validate.yaml b/.github/workflows/validate.yaml
deleted file mode 100644
index f518c1a..0000000
--- a/.github/workflows/validate.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
-name: Validate
-
-on:
-  push:
-  pull_request:
-  schedule:
-    - cron: "0 0 * * *"
-
-jobs:
-  validate:
-    runs-on: "ubuntu-latest"
-    steps:
-      - uses: "actions/checkout@v2"
-      - name: HACS validation
-        uses: "hacs/integration/action@main"
-        with:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          CATEGORY: integration