From 6ac65f8eba05bd697c0ae17e1bde6acba4d91e9a Mon Sep 17 00:00:00 2001 From: Joe Milazzo Date: Sun, 29 Oct 2023 08:51:23 -0500 Subject: [PATCH] Prep for Hotfix (#2364) --- .github/workflows/develop-workflow.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/develop-workflow.yml b/.github/workflows/develop-workflow.yml index d8fe34bff..17d4e01f6 100644 --- a/.github/workflows/develop-workflow.yml +++ b/.github/workflows/develop-workflow.yml @@ -21,7 +21,7 @@ jobs: build: name: Upload Kavita.Common for Version Bump runs-on: ubuntu-latest - if: ${{ github.event_name == 'push' && (github.ref == 'refs/heads/develop') }} + if: github.event.pull_request.merged == true && !contains(github.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_name == 'push' && (github.ref == 'refs/heads/develop') }} + if: github.event.pull_request.merged == true && !contains(github.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_name == 'push' && (github.ref == 'refs/heads/develop') }} + if: github.event.pull_request.merged == true && !contains(github.head_ref, 'release') permissions: packages: write contents: read