From 0cf760ecd3d86e4adeefef5217a10e5a0cb618fb Mon Sep 17 00:00:00 2001
From: Joe Milazzo <josephmajora@gmail.com>
Date: Sat, 28 Oct 2023 14:25:42 -0500
Subject: [PATCH] v0.7.10 - Bugfixes (#2360)

---
 .github/workflows/develop-workflow.yml |  4 ++--
 .github/workflows/release-workflow.yml | 10 +++++++---
 Kavita.Common/Kavita.Common.csproj     |  4 ++--
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/develop-workflow.yml b/.github/workflows/develop-workflow.yml
index 468c22540..86ae6eb37 100644
--- a/.github/workflows/develop-workflow.yml
+++ b/.github/workflows/develop-workflow.yml
@@ -2,9 +2,9 @@ name: Nightly Workflow
 
 on:
   push:
-    branches: '**'
+    branches: ['!release/**']
   pull_request:
-    branches: [ develop, '!release/**' ]
+    branches: [ 'develop', '!release/**' ]
     types: [ closed ]
 
 jobs:
diff --git a/.github/workflows/release-workflow.yml b/.github/workflows/release-workflow.yml
index 3645c9ea1..3555b278f 100644
--- a/.github/workflows/release-workflow.yml
+++ b/.github/workflows/release-workflow.yml
@@ -1,13 +1,15 @@
-name: Release Workflow
+name: Stable Workflow
 
 on:
+  push:
+    branches: ['release/**']
   pull_request:
-    branches: [ release/** ]
+    branches: [ 'develop' ]
     types: [ closed ]
 
 jobs:
   if_merged:
-    if: github.event.pull_request.merged == true
+    if: github.event.pull_request.merged == true && contains(github.head_ref, 'release')
     runs-on: ubuntu-latest
     steps:
       - run: |
@@ -15,6 +17,7 @@ jobs:
   build:
     name: Upload Kavita.Common for Version Bump
     runs-on: ubuntu-latest
+    if: github.event.pull_request.merged == true && contains(github.head_ref, 'release')
     steps:
       - name: Checkout Repo
         uses: actions/checkout@v3
@@ -29,6 +32,7 @@ jobs:
   stable:
     name: Build Stable and Nightly Docker if Release
     needs: [ build ]
+    if: github.event.pull_request.merged == true && contains(github.head_ref, 'release')
     runs-on: ubuntu-latest
     permissions:
       packages: write
diff --git a/Kavita.Common/Kavita.Common.csproj b/Kavita.Common/Kavita.Common.csproj
index 3cd3caace..dc5e64464 100644
--- a/Kavita.Common/Kavita.Common.csproj
+++ b/Kavita.Common/Kavita.Common.csproj
@@ -4,7 +4,7 @@
         <TargetFramework>net7.0</TargetFramework>
         <Company>kavitareader.com</Company>
         <Product>Kavita</Product>
-        <AssemblyVersion>0.7.10.1</AssemblyVersion>
+        <AssemblyVersion>0.7.10.0</AssemblyVersion>
         <NeutralLanguage>en</NeutralLanguage>
         <TieredPGO>true</TieredPGO>
     </PropertyGroup>
@@ -21,4 +21,4 @@
     </ItemGroup>
 
 
-</Project>
\ No newline at end of file
+</Project>