Skip to content

Commit

Permalink
Merge branch 'android14' of https://github.com/seedvault-app/seedvault
Browse files Browse the repository at this point in the history
* 'android14' of https://github.com/seedvault-app/seedvault:
  Bump version to 14-4.0 - D2D <3
  Add '/build' folders to .gitignore
  Stop backing up excluded app APKs
  Show size of app backups in Backup Status screen
  Store size of app backups in metadata
  Add experimental support for forcing D2D transfer backups
  Bump version and set property for testing
  colors: Switch to public APIs for colors
  Initial support for backup of D2D-only apps
  Pretend to be a device to device data transport
  Fix double start of restore session
  Add some comments to storage Restore
  Support installing via F-Droid Basic
  Apply latest code review suggestions
  fixup! Allow secondary user backup to USB
  Apply code review suggestions
  Fix binder exception when restoring a large number of applications
  Allow restoring data for a greater number of apps
  Clean up Gradle build scripts
  Switch to Kotlin build scripts + version catalog

Change-Id: I26f7c3e688ecadedc3fd0a3c6203ed8891435a71
  • Loading branch information
chirayudesai committed Feb 9, 2024
2 parents 781543a + 9c4f9d8 commit 12a3203
Show file tree
Hide file tree
Showing 74 changed files with 1,351 additions and 841 deletions.
4 changes: 3 additions & 1 deletion .github/scripts/run_tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,10 @@ echo "Setting Seedvault transport..."
sleep 10
adb shell bmgr transport com.stevesoltys.seedvault.transport.ConfigurableBackupTransport

D2D_BACKUP_TEST=$1

large_test_exit_code=0
./gradlew --stacktrace -Pinstrumented_test_size=large :app:connectedAndroidTest || large_test_exit_code=$?
./gradlew --stacktrace -Pinstrumented_test_size=large -Pd2d_backup_test="$D2D_BACKUP_TEST" :app:connectedAndroidTest || large_test_exit_code=$?

adb pull /sdcard/seedvault_test_results

Expand Down
14 changes: 13 additions & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,15 @@
name: Build
on: [push, pull_request]
on: [ push, pull_request ]

concurrency:
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
cancel-in-progress: true

permissions:
contents: read
actions: read
checks: write

jobs:
build:
name: Build
Expand Down Expand Up @@ -40,3 +45,10 @@ jobs:
app/build/outputs/apk/debug/app-debug.apk
contactsbackup/build/outputs/apk/debug/contactsbackup-debug.apk
storage/demo/build/outputs/apk/debug/demo-debug.apk
- name: Publish Test Report
uses: mikepenz/action-junit-report@v4
if: success() || failure()
with:
report_paths: '**/build/test-results/**/TEST-*.xml'

3 changes: 2 additions & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ jobs:
matrix:
android_target: [ 33, 34 ]
emulator_type: [ default ]
d2d_backup_test: [ true, false ]
steps:
- name: Checkout Code
uses: actions/checkout@v3
Expand Down Expand Up @@ -52,7 +53,7 @@ jobs:
disable-animations: true
script: |
./app/development/scripts/provision_emulator.sh "test" "system-images;android-${{ matrix.android_target }};${{ matrix.emulator_type }};x86_64"
./.github/scripts/run_tests.sh
./.github/scripts/run_tests.sh ${{ matrix.d2d_backup_test }}
- name: Upload test results
if: always()
Expand Down
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ hs_err_pid*

## Intellij
out/
build/
storage/build/
contactsbackup/build/
/lib/
.idea/*
!.idea/runConfigurations*
Expand Down
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
## [14-4.0] - 2024-01-24
* Add experimental support for forcing "D2D" transfer backups
* Pretend to be a device-to-device transfer to allow backing up many apps which prevent backup
* Stop backing up excluded app APKs
* Show size of app backups in Backup Status screen
* Slight improvements to color scheme
* Development: Improve CI testing setup

## [14-3.3] - 2023-10-06
* Android 14

Expand Down
243 changes: 0 additions & 243 deletions app/build.gradle

This file was deleted.

Loading

0 comments on commit 12a3203

Please sign in to comment.