From 7c586a1c4170cfe28f36ce9b65cd13fabb3839d3 Mon Sep 17 00:00:00 2001 From: Robbie Davis Date: Sun, 17 Mar 2024 14:46:02 -0400 Subject: [PATCH] Update develop-workflow.yml --- .github/workflows/develop-workflow.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/develop-workflow.yml b/.github/workflows/develop-workflow.yml index aa9855d8f..f4c7363f0 100644 --- a/.github/workflows/develop-workflow.yml +++ b/.github/workflows/develop-workflow.yml @@ -2,7 +2,7 @@ name: Nightly Workflow on: push: - branches: ['!release/**'] + branches: ['develop', '!release/**'] pull_request: branches: [ 'develop', '!release/**' ] types: [ closed, synchronize ] @@ -21,7 +21,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') + if: github.event.pull_request.merged == true && ( github.event.pull_request.head.ref == 'develop' || !contains(github.event.pull_request.head.ref, 'release') ) steps: - name: Checkout Repo uses: actions/checkout@v3 @@ -37,7 +37,7 @@ jobs: name: Bump version needs: [ build ] runs-on: ubuntu-latest - if: github.event.pull_request.merged == true && !contains(github.head_ref, 'release') + if: github.event.pull_request.merged == true && ( github.event.pull_request.head.ref == 'develop' || !contains(github.event.pull_request.head.ref, 'release') ) steps: - uses: actions/checkout@v3 with: @@ -59,7 +59,7 @@ jobs: name: Build Nightly Docker needs: [ build, version ] runs-on: ubuntu-latest - if: github.event.pull_request.merged == true && !contains(github.head_ref, 'release') + if: github.event.pull_request.merged == true && ( github.event.pull_request.head.ref == 'develop' || !contains(github.event.pull_request.head.ref, 'release') ) permissions: packages: write contents: read