From 08d16218f21713ddc66aee200771bb78800d73a4 Mon Sep 17 00:00:00 2001 From: Robbie Davis Date: Sun, 22 Oct 2023 13:34:30 -0400 Subject: [PATCH] Updating workflows (#2344) --- .github/workflows/develop-workflow.yml | 12 +++++++----- .github/workflows/release-workflow.yml | 6 ++---- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/develop-workflow.yml b/.github/workflows/develop-workflow.yml index 477a24b42..468c22540 100644 --- a/.github/workflows/develop-workflow.yml +++ b/.github/workflows/develop-workflow.yml @@ -1,17 +1,17 @@ name: Nightly Workflow on: + push: + branches: '**' pull_request: - types: - - closed - branches: - - develop - - '!release/**' + branches: [ develop, '!release/**' ] + types: [ closed ] jobs: build: name: Upload Kavita.Common for Version Bump runs-on: ubuntu-latest + if: ${{ github.event_name == 'push' && (github.ref == 'refs/heads/develop') }} steps: - name: Checkout Repo uses: actions/checkout@v3 @@ -27,6 +27,7 @@ jobs: name: Bump version needs: [ build ] runs-on: ubuntu-latest + if: ${{ github.event_name == 'push' && (github.ref == 'refs/heads/develop') }} steps: - uses: actions/checkout@v3 with: @@ -48,6 +49,7 @@ jobs: name: Build Nightly Docker needs: [ build, version ] runs-on: ubuntu-latest + if: ${{ github.event_name == 'push' && (github.ref == 'refs/heads/develop') }} permissions: packages: write contents: read diff --git a/.github/workflows/release-workflow.yml b/.github/workflows/release-workflow.yml index 9559784b9..3645c9ea1 100644 --- a/.github/workflows/release-workflow.yml +++ b/.github/workflows/release-workflow.yml @@ -2,10 +2,8 @@ name: Release Workflow on: pull_request: - types: - - closed - branches: - - 'release/**' + branches: [ release/** ] + types: [ closed ] jobs: if_merged: