From 0f747a64acfe6eed4c82af4925c49680a6222720 Mon Sep 17 00:00:00 2001
From: Lawrence Goldstien <lawrence@simplecat.software>
Date: Mon, 13 Jan 2020 07:31:40 +0000
Subject: [PATCH] merge workflow ci files

---
 .github/workflows/{test.yml => ci.yml} | 24 ++++++++++++++++++++++--
 .github/workflows/publish.yml          | 24 ------------------------
 2 files changed, 22 insertions(+), 26 deletions(-)
 rename .github/workflows/{test.yml => ci.yml} (71%)
 delete mode 100644 .github/workflows/publish.yml

diff --git a/.github/workflows/test.yml b/.github/workflows/ci.yml
similarity index 71%
rename from .github/workflows/test.yml
rename to .github/workflows/ci.yml
index 81fd462..05565cc 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/ci.yml
@@ -1,4 +1,4 @@
-name: Test
+name: Continuous Integration
 on:
   push:
     branches:
@@ -24,7 +24,11 @@ jobs:
       - name: Test
         run: make test
 
-      - name: Release candidate
+  release:
+    name: Make release
+    runs-on: ubuntu-latest
+    steps:
+      - name: Make release candidate
         uses: actions/github-script@0.3.0
         id: author-date
         with:
@@ -45,3 +49,19 @@ jobs:
               target_commitish: context.sha,
               body: "Release Candidate"
             });
+
+  publish:
+    name: Publish release artefacts
+    runs-on: ubuntu-latest
+    steps:
+      - name: Generate artifacts
+        uses: skx/github-action-build@master
+        with:
+          builder: scripts/build.sh
+
+      - name: Publish artifacts
+        uses: skx/github-action-publish-binaries@master
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          args: 'terraform-provider-remotefile-*'
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
deleted file mode 100644
index 6340bf2..0000000
--- a/.github/workflows/publish.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-name: Publish Release Artifacts
-on:
-  release:
-    types: [created]
-
-jobs:
-  build:
-    name: Build and Push
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@master
-
-      - name: Generate artifacts
-        uses: skx/github-action-build@master
-        with:
-          builder: scripts/build.sh
-
-      - name: Publish artifacts
-        uses: skx/github-action-publish-binaries@master
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          args: 'terraform-provider-remotefile-*'