Skip to content

Commit 2f00c65

Browse files
committed
Merge branch 'refs/heads/master' into feat/notifications-settings
2 parents 55cd625 + 33c485b commit 2f00c65

File tree

2 files changed

+13
-7
lines changed

2 files changed

+13
-7
lines changed

.github/workflows/e2e.yml

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ on:
44
workflow_dispatch:
55
inputs:
66
e2e_branch:
7-
description: "Branch of synonymdev/bitkit-e2e-tests to use"
7+
description: "Branch of synonymdev/bitkit-e2e-tests to use (main | default-feature-branch | custom branch name)"
88
required: false
9-
default: "main"
9+
default: "default-feature-branch"
1010
pull_request:
1111

1212
env:
@@ -60,10 +60,16 @@ jobs:
6060
name: bitkit-e2e-apk_${{ github.run_number }}
6161
path: app/build/outputs/apk/dev/debug/bitkit_e2e.apk
6262

63+
e2e-branch:
64+
uses: synonymdev/bitkit-e2e-tests/.github/workflows/determine-e2e-branch.yml@main
65+
with:
66+
app_branch: ${{ github.head_ref || github.ref_name }}
67+
e2e_branch_input: ${{ github.event.inputs.e2e_branch || 'default-feature-branch' }}
68+
6369
e2e-tests:
6470
if: github.event.pull_request.draft == false
6571
runs-on: ubuntu-latest
66-
needs: build
72+
needs: [build, e2e-branch]
6773

6874
strategy:
6975
fail-fast: false
@@ -81,15 +87,15 @@ jobs:
8187
steps:
8288
- name: Show selected E2E branch
8389
env:
84-
E2E_BRANCH: ${{ github.event.inputs.e2e_branch || 'main' }}
90+
E2E_BRANCH: ${{ needs.e2e-branch.outputs.branch }}
8591
run: echo $E2E_BRANCH
8692

8793
- name: Clone E2E tests
8894
uses: actions/checkout@v4
8995
with:
9096
repository: synonymdev/bitkit-e2e-tests
9197
path: bitkit-e2e-tests
92-
ref: ${{ github.event.inputs.e2e_branch || 'main' }}
98+
ref: ${{ needs.e2e-branch.outputs.branch }}
9399

94100
- name: Enable KVM
95101
run: |

app/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ android {
4141
applicationId = "to.bitkit"
4242
minSdk = 28
4343
targetSdk = 35
44-
versionCode = 14
45-
versionName = "0.0.14"
44+
versionCode = 15
45+
versionName = "0.0.15"
4646
testInstrumentationRunner = "to.bitkit.test.HiltTestRunner"
4747
vectorDrawables {
4848
useSupportLibrary = true

0 commit comments

Comments
 (0)