From f4351df302ae5113ac04766c1b720d160aa1284a Mon Sep 17 00:00:00 2001
From: JonnyWong16 <JonnyWong16@users.noreply.github.com>
Date: Sun, 8 Mar 2020 16:37:19 -0700
Subject: [PATCH] Combine release workflows

---
 .github/workflows/publishrelease-beta.yml     | 29 -------------------
 ...hrelease-master.yml => publishrelease.yml} |  3 +-
 2 files changed, 1 insertion(+), 31 deletions(-)
 delete mode 100644 .github/workflows/publishrelease-beta.yml
 rename .github/workflows/{publishrelease-master.yml => publishrelease.yml} (92%)

diff --git a/.github/workflows/publishrelease-beta.yml b/.github/workflows/publishrelease-beta.yml
deleted file mode 100644
index 28183600..00000000
--- a/.github/workflows/publishrelease-beta.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-name: Create Pre-Release
-on:
-  push:
-    tags:
-      - 'v*-beta'
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout Code
-        uses: actions/checkout@master
-      - name: Get Release Version
-        run: echo ::set-env name=RELEASE_VERSION::${GITHUB_REF/refs\/tags\//}
-      - name: Get Changelog
-        run: echo ::set-env name=CHANGELOG::"$( sed -n '/^## /{p; :loop n; p; /^## /q; b loop}' CHANGELOG.md | sed '$d' | sed '$d' | sed '$d' | sed ':a;N;$!ba;s/\n/%0A/g' )"
-      - name: Create Release
-        id: create_release
-        uses: actions/create-release@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          tag_name: ${{ env.RELEASE_VERSION }}
-          release_name: Tautulli ${{ env.RELEASE_VERSION }}
-          body: |
-            ## Changelog
-            
-            ##${{ env.CHANGELOG }}
-          draft: false
-          prerelease: true
diff --git a/.github/workflows/publishrelease-master.yml b/.github/workflows/publishrelease.yml
similarity index 92%
rename from .github/workflows/publishrelease-master.yml
rename to .github/workflows/publishrelease.yml
index e7795681..f5e0b5d9 100644
--- a/.github/workflows/publishrelease-master.yml
+++ b/.github/workflows/publishrelease.yml
@@ -3,7 +3,6 @@ on:
   push:
     tags:
       - 'v*'
-      - '!v*-beta'
 jobs:
   build:
     runs-on: ubuntu-latest
@@ -27,4 +26,4 @@ jobs:
             
             ##${{ env.CHANGELOG }}
           draft: false
-          prerelease: false
+          prerelease: ${{ endsWith(env.RELEASE_VERSION, '-beta') }}