Skip to content

Commit

Permalink
Merge branch 'master' into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
asandikci committed Dec 6, 2024
2 parents 88fa0ce + a66d7ce commit 95d7db8
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 2 deletions.
6 changes: 6 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ on:
branches:
- dev
- master
- extended
paths-ignore:
- 'README.md'
- 'doc/**'
Expand Down Expand Up @@ -49,6 +50,11 @@ jobs:
- name: Build debug APK and run jvm tests
run: ./gradlew assembleDebug lintDebug testDebugUnitTest --stacktrace -DskipFormatKtlint

- name: Generate checksum
run: |
sha256sum app/build/outputs/apk/debug/*.apk > app/build/outputs/apk/debug/checksums.txt
echo "::notice::$(cat app/build/outputs/apk/debug/checksums.txt)"
- name: Upload APK
uses: actions/upload-artifact@v4
with:
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@ graph TD
D --> | Test & Mini Changes | E[master]
D --> X[A-feature]
D --> Y[B-feature]
X --> F[extended]
Y --> F
X --> | REVIEW | F[extended]
Y --> | REVIEW | F
F --> | Pre-Release | G(v0.xx.x-extended)
Expand Down

0 comments on commit 95d7db8

Please sign in to comment.