diff --git a/.github/workflows/java-release.yml b/.github/workflows/java-release.yml index 32e097978..e882541bd 100644 --- a/.github/workflows/java-release.yml +++ b/.github/workflows/java-release.yml @@ -24,7 +24,7 @@ on: jobs: release: - if: github.event_name == 'workflow_dispatch' || (github.event_name == 'pull_request' && github.event.pull_request.merged && startsWith(github.event.pull_request.head.ref, 'release/')) + if: github.event_name == 'workflow_dispatch' || (github.event_name == 'pull_request' && github.event.pull_request.merged && startsWith(github.event.pull_request.head.ref, 'release/') && github.event.pull_request.base.ref == 'v4_development') runs-on: ubuntu-latest environment: release diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 528fb5400..208507eef 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -4,6 +4,8 @@ on: pull_request: types: - closed + branches: + - v4_development workflow_dispatch: permissions: diff --git a/.github/workflows/rl-scanner.yml b/.github/workflows/rl-scanner.yml index bc3dca514..12bcf573b 100644 --- a/.github/workflows/rl-scanner.yml +++ b/.github/workflows/rl-scanner.yml @@ -29,7 +29,7 @@ on: jobs: rl-scanner: name: Run Reversing Labs Scanner - if: github.event_name == 'workflow_dispatch' || (github.event_name == 'pull_request' && github.event.pull_request.merged && startsWith(github.event.pull_request.head.ref, 'release/')) + if: github.event_name == 'workflow_dispatch' || (github.event_name == 'pull_request' && github.event.pull_request.merged && startsWith(github.event.pull_request.head.ref, 'release/') && github.event.pull_request.base.ref == 'v4_development') runs-on: ubuntu-latest outputs: scan-status: ${{ steps.rl-scan-conclusion.outcome }}