From 5adbc4aa6a285c3d425266abf9dbae1d65525b00 Mon Sep 17 00:00:00 2001
From: Daniel Lockyer <hi@daniellockyer.com>
Date: Thu, 16 Apr 2020 07:36:15 +0100
Subject: [PATCH] Moved Ghost-CLI tests to main testing workflow

no issue

- keeps all testing in one place and allows us to depend on a single
  workflow in the future
---
 .github/workflows/ghost-cli.yml | 37 ---------------------------------
 .github/workflows/test.yml      | 31 +++++++++++++++++++++++++++
 2 files changed, 31 insertions(+), 37 deletions(-)
 delete mode 100644 .github/workflows/ghost-cli.yml

diff --git a/.github/workflows/ghost-cli.yml b/.github/workflows/ghost-cli.yml
deleted file mode 100644
index fbb55ed968..0000000000
--- a/.github/workflows/ghost-cli.yml
+++ /dev/null
@@ -1,37 +0,0 @@
-name: Ghost-CLI
-on:
-  pull_request:
-  push:
-    branches:
-      - master
-
-jobs:
-  test:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-        with:
-          fetch-depth: 0
-          submodules: true
-      - uses: actions/setup-node@v1
-        with:
-          node-version: '10'
-      - run: npm install -g ghost-cli@next
-      - run: zip -r ghost.zip .
-
-      - name: Clean Install
-        run: |
-          DIR=$(mktemp -d)
-          ghost install local -d $DIR --zip $GITHUB_WORKSPACE/ghost.zip
-
-      - name: Latest Release
-        run: |
-          DIR=$(mktemp -d)
-          ghost install local -d $DIR
-          ghost update -d $DIR --zip $GITHUB_WORKSPACE/ghost.zip
-
-      - name: Previous Major
-        run: |
-          DIR=$(mktemp -d)
-          ghost install v2 --local -d $DIR
-          ghost update -f -d $DIR --zip $GITHUB_WORKSPACE/ghost.zip
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 6b4e0201b3..fe1005ac41 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -46,3 +46,34 @@ jobs:
       - run: grunt test-unit --verbose
       - run: grunt test-regression --verbose
         if: startsWith(github.head_ref, 'renovate/') || github.event_name != 'pull_request' || contains(github.event.pull_request.labels.*.name, 'all-tests')
+
+  ghost-cli:
+    name: Ghost-CLI
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+          submodules: true
+      - uses: actions/setup-node@v1
+        with:
+          node-version: '10'
+      - run: npm install -g ghost-cli@next
+      - run: zip -r ghost.zip .
+
+      - name: Clean Install
+        run: |
+          DIR=$(mktemp -d)
+          ghost install local -d $DIR --zip $GITHUB_WORKSPACE/ghost.zip
+
+      - name: Latest Release
+        run: |
+          DIR=$(mktemp -d)
+          ghost install local -d $DIR
+          ghost update -d $DIR --zip $GITHUB_WORKSPACE/ghost.zip
+
+      - name: Previous Major
+        run: |
+          DIR=$(mktemp -d)
+          ghost install v2 --local -d $DIR
+          ghost update -f -d $DIR --zip $GITHUB_WORKSPACE/ghost.zip