Skip to content

Commit 5eba7ac

Browse files
committed
Merge remote-tracking branch 'origin/v4_development' into SDK-6233-The-SDK-doesn-t-handle-configuration-changes-correctly-on-device-rotation-and-causes-a-memory-leak
2 parents 43d43ca + 9f10837 commit 5eba7ac

File tree

3 files changed

+4
-2
lines changed

3 files changed

+4
-2
lines changed

.github/workflows/java-release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ on:
2424

2525
jobs:
2626
release:
27-
if: github.event_name == 'workflow_dispatch' || (github.event_name == 'pull_request' && github.event.pull_request.merged && startsWith(github.event.pull_request.head.ref, 'release/'))
27+
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')
2828
runs-on: ubuntu-latest
2929
environment: release
3030

.github/workflows/release.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ on:
44
pull_request:
55
types:
66
- closed
7+
branches:
8+
- v4_development
79
workflow_dispatch:
810

911
permissions:

.github/workflows/rl-scanner.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ on:
2929
jobs:
3030
rl-scanner:
3131
name: Run Reversing Labs Scanner
32-
if: github.event_name == 'workflow_dispatch' || (github.event_name == 'pull_request' && github.event.pull_request.merged && startsWith(github.event.pull_request.head.ref, 'release/'))
32+
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')
3333
runs-on: ubuntu-latest
3434
outputs:
3535
scan-status: ${{ steps.rl-scan-conclusion.outcome }}

0 commit comments

Comments
 (0)