Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
newhinton committed Jan 18, 2024
2 parents eb67987 + 2692787 commit c3dd4ec
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 10 deletions.
14 changes: 5 additions & 9 deletions .github/workflows/android.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,29 +40,25 @@ jobs:
uses: actions/upload-artifact@v3
with:
name: nightly-armeabi.apk
path: app/build/outputs/apk/oss/debug/roundsync_v*-oss-armeabi-v7a-debug.apk
retention-days: 3
path: app/build/outputs/apk/oss/debug/roundsync_v*?(-beta)-oss-armeabi-v7a-debug.apk
- name: Upload APK (arm64)
uses: actions/upload-artifact@v3
with:
name: nightly-arm64.apk
path: app/build/outputs/apk/oss/debug/roundsync_v*-oss-arm64-v8a-debug.apk
retention-days: 3
path: app/build/outputs/apk/oss/debug/roundsync_v*?(-beta)-oss-arm64-v8a-debug.apk
- name: Upload APK (x86)
uses: actions/upload-artifact@v3
with:
name: nightly-x86.apk
path: app/build/outputs/apk/oss/debug/roundsync_v*-oss-x86-debug.apk
retention-days: 3
path: app/build/outputs/apk/oss/debug/roundsync_v*?(-beta)-oss-x86-debug.apk
- name: Upload APK (arm)
uses: actions/upload-artifact@v3
with:
name: nightly-x64.apk
path: app/build/outputs/apk/oss/debug/roundsync_v*-oss-x86_64-debug.apk
retention-days: 3
path: app/build/outputs/apk/oss/debug/roundsync_v*?(-beta)-oss-x86_64-debug.apk
- name: Upload APK (universal)
uses: actions/upload-artifact@v3
with:
name: nightly-universal.apk
path: app/build/outputs/apk/oss/debug/roundsync_v*-oss-universal-debug.apk
path: app/build/outputs/apk/oss/debug/roundsync_v*?(-beta)-oss-universal-debug.apk
retention-days: 14
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,8 @@ See [CONTRIBUTING](./CONTRIBUTING.md)

Anyone is welcome to contribute and help out. However, hate, discrimination and racism are decidedly unwelcome here. If you feel offended by this, you might belong to the group of people who are not welcome. I will not tolerate hate in any way.

If you want to add more translations, see our [weblate-project](https://hosted.weblate.org/projects/round-sync/round-sync/)!


License
-----------------
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ org.gradle.jvmargs=-Xmx4096M -Dkotlin.daemon.jvm.options\="-Xmx4096M"
android.enableJetifier=false
android.useAndroidX=true
de.felixnuesse.extract.goVersion=1.20.11
de.felixnuesse.extract.rCloneVersion=1.65.0
de.felixnuesse.extract.rCloneVersion=1.65.1
de.felixnuesse.extract.ndkVersion=25.2.9519653
de.felixnuesse.extract.ndkToolchainVersion=33
android.defaults.buildfeatures.buildconfig=true
Expand Down

0 comments on commit c3dd4ec

Please sign in to comment.