Skip to content

Commit a5070bc

Browse files
authored
Merge branch 'master' into fix/node-stopping-bg-payments
2 parents 3b23d43 + ee19d6a commit a5070bc

4 files changed

Lines changed: 113 additions & 24 deletions

File tree

.github/ISSUE_TEMPLATE/bug_report.yml

Lines changed: 45 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,15 @@ body:
66
id: description
77
attributes:
88
label: What happened?
9-
placeholder: Describe the bug and what you expected instead
9+
placeholder: Describe the bug
10+
validations:
11+
required: false
12+
13+
- type: textarea
14+
id: expected
15+
attributes:
16+
label: Expected behavior
17+
placeholder: What did you expect to happen instead?
1018
validations:
1119
required: false
1220

@@ -30,9 +38,42 @@ body:
3038
required: false
3139

3240
- type: input
33-
id: environment
41+
id: version
42+
attributes:
43+
label: Bitkit Version
44+
placeholder: e.g., 2.0.0
45+
validations:
46+
required: false
47+
48+
- type: input
49+
id: device
3450
attributes:
35-
label: Environment
36-
placeholder: e.g., v2.0.0, Pixel 7, Android 14, mainnet
51+
label: Device / OS
52+
placeholder: e.g., Pixel 7, Android 14
53+
validations:
54+
required: false
55+
56+
- type: dropdown
57+
id: reproducibility
58+
attributes:
59+
label: Reproducibility
60+
options:
61+
- Always
62+
- Often (>50%)
63+
- Sometimes (<50%)
64+
- Rarely (once or twice)
65+
validations:
66+
required: false
67+
68+
- type: textarea
69+
id: context
70+
attributes:
71+
label: Additional context
72+
placeholder: |
73+
Any other context about the problem, e.g.:
74+
- New wallet / Restored from backup / Migrated from RN
75+
- Lightning or on-chain related
76+
- Specific channel state
77+
- Environment (Mainnet / Regtest / Local)
3778
validations:
3879
required: false
Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
name: Feature Request
2+
description: Suggest a new feature or improvement
3+
type: feature
4+
body:
5+
- type: textarea
6+
id: problem
7+
attributes:
8+
label: Problem or use case
9+
placeholder: What problem does this solve? Why do you need this?
10+
validations:
11+
required: false
12+
13+
- type: textarea
14+
id: solution
15+
attributes:
16+
label: Proposed solution
17+
placeholder: Describe what you'd like to happen
18+
validations:
19+
required: false
20+
21+
- type: textarea
22+
id: alternatives
23+
attributes:
24+
label: Alternatives considered
25+
placeholder: Any workarounds or alternative solutions you've thought of?
26+
validations:
27+
required: false
28+
29+
- type: textarea
30+
id: context
31+
attributes:
32+
label: Additional context
33+
placeholder: Screenshots, mockups, links, or any other context
34+
validations:
35+
required: false

.github/workflows/e2e.yml

Lines changed: 32 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,6 @@ on:
88
required: false
99
default: "default-feature-branch"
1010
pull_request:
11-
paths:
12-
- 'app/**'
13-
- 'gradle/**'
14-
- '*.gradle.kts'
15-
- 'gradle.properties'
16-
- '.github/workflows/e2e.yml'
1711

1812
env:
1913
TERM: xterm-256color
@@ -24,9 +18,29 @@ concurrency:
2418
cancel-in-progress: true
2519

2620
jobs:
27-
build:
21+
detect-changes:
2822
if: github.event.pull_request.draft == false
2923
runs-on: ubuntu-latest
24+
outputs:
25+
code: ${{ github.event_name == 'workflow_dispatch' || steps.filter.outputs.code == 'true' }}
26+
steps:
27+
- uses: actions/checkout@v4
28+
- uses: dorny/paths-filter@v3
29+
if: github.event_name == 'pull_request'
30+
id: filter
31+
with:
32+
filters: |
33+
code:
34+
- 'app/**'
35+
- 'gradle/**'
36+
- '*.gradle.kts'
37+
- 'gradle.properties'
38+
- '.github/workflows/e2e.yml'
39+
40+
build:
41+
needs: detect-changes
42+
if: github.event.pull_request.draft == false && needs.detect-changes.outputs.code == 'true'
43+
runs-on: ubuntu-latest
3044

3145
steps:
3246
- name: Checkout
@@ -67,16 +81,17 @@ jobs:
6781
path: app/build/outputs/apk/dev/debug/bitkit_e2e.apk
6882

6983
e2e-branch:
70-
if: github.event.pull_request.draft == false
84+
needs: detect-changes
85+
if: github.event.pull_request.draft == false && needs.detect-changes.outputs.code == 'true'
7186
uses: synonymdev/bitkit-e2e-tests/.github/workflows/determine-e2e-branch.yml@main
7287
with:
7388
app_branch: ${{ github.head_ref || github.ref_name }}
7489
e2e_branch_input: ${{ github.event.inputs.e2e_branch || 'default-feature-branch' }}
7590

7691
e2e-tests:
77-
if: github.event.pull_request.draft == false
92+
if: github.event.pull_request.draft == false && needs.detect-changes.outputs.code == 'true'
7893
runs-on: ubuntu-latest
79-
needs: [build, e2e-branch]
94+
needs: [detect-changes, build, e2e-branch]
8095

8196
strategy:
8297
fail-fast: false
@@ -238,12 +253,17 @@ jobs:
238253
if: always() && github.event.pull_request.draft == false
239254
name: e2e-status
240255
runs-on: ubuntu-latest
241-
needs: [e2e-tests]
256+
needs: [detect-changes, e2e-tests]
242257
steps:
258+
- name: E2E skipped - no code changes
259+
if: needs.detect-changes.outputs.code != 'true'
260+
run: echo "✅ E2E skipped - no code changes"
261+
243262
- name: Verify all E2E shards succeeded
263+
if: needs.detect-changes.outputs.code == 'true'
244264
run: |
245265
if [ "${{ needs.e2e-tests.result }}" != "success" ]; then
246266
echo "❌ Some E2E shards failed."
247267
exit 1
248268
fi
249-
echo "✅ All E2E shards passed!"
269+
echo "✅ All E2E shards passed!"

README.md

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,8 @@
11
# Bitkit Android (Native)
22

3-
> [!CAUTION]
4-
> ⚠️This is **NOT** the repository of the Bitkit app from the app stores!<br>
5-
> ⚠️Work-in-progress<br>
6-
> The Bitkit app repository is here: **[github.com/synonymdev/bitkit](https://github.com/synonymdev/bitkit)**
7-
8-
---
9-
103
## About
114

12-
This repository contains a **new native Android app** which is **not ready for production**.
5+
This repository contains the **native Android app** for Bitkit.
136

147
## Development
158

0 commit comments

Comments
 (0)