Merge branch 'antennapodunbuilt' into 'master'

Misc fixups for failed builds

See merge request fdroid/fdroiddata!5841
This commit is contained in:
Licaon_Kter 2019-10-31 18:16:45 +00:00
commit 1438c82b37
8 changed files with 15 additions and 25 deletions

View file

@ -57,10 +57,8 @@ Builds:
- yes - yes
rm: rm:
- node_modules/@react-native-community/async-storage/packages/storage-legacy/android/build/ - node_modules/@react-native-community/async-storage/packages/storage-legacy/android/build/
- node_modules/hermesvm/win64-bin/
- node_modules/react-native/template/ - node_modules/react-native/template/
- node_modules/jetifier/lib/ - node_modules/jetifier/lib/
- node_modules/hermesvm/android/*.aar
prebuild: prebuild:
- truncate -s 0 ../../node_modules/@react-native-community/cli/build/commands/server/external/xsel - truncate -s 0 ../../node_modules/@react-native-community/cli/build/commands/server/external/xsel
- sed -i -e 's/enableSeparateBuildPerCPUArchitecture = true/enableSeparateBuildPerCPUArchitecture - sed -i -e 's/enableSeparateBuildPerCPUArchitecture = true/enableSeparateBuildPerCPUArchitecture

View file

@ -133,8 +133,8 @@ Builds:
rm: rm:
- vendor/react-native-aes/android/build/ - vendor/react-native-aes/android/build/
prebuild: prebuild:
- truncate -s 0 ../../node_modules/react-native/local-cli/server/util/external/xsel - truncate -s 0 ../../node_modules/@react-native-community/cli/build/commands/server/external/xsel
- sed -i -e 's/gradle-4.1/gradle-4.6/' gradle/wrapper/gradle-wrapper.properties - sed -i -e 's/gradle-4.1/gradle-5.4.1/' gradle/wrapper/gradle-wrapper.properties
scanignore: scanignore:
- android/build.gradle - android/build.gradle
- node_modules/react-native-screens/android/build.gradle - node_modules/react-native-screens/android/build.gradle

View file

@ -604,16 +604,6 @@ Builds:
gradleprops: gradleprops:
- freeBuild - freeBuild
- versionName: 1.7.3b
versionCode: 1070396
commit: 1.7.3b
subdir: app
init: sed -i '/playCompile/d' ../core/build.gradle
gradle:
- free
gradleprops:
- freeBuild
- versionName: 1.7.3c - versionName: 1.7.3c
versionCode: 1070397 versionCode: 1070397
commit: 1.7.3c commit: 1.7.3c

View file

@ -71,6 +71,7 @@ Builds:
- versionName: 0.13.0 - versionName: 0.13.0
versionCode: 684 versionCode: 684
disable: unbuildable
commit: v0.13.0 commit: v0.13.0
output: build/app/outputs/apk/fdroid/release/app-fdroid-release.apk output: build/app/outputs/apk/fdroid/release/app-fdroid-release.apk
srclibs: srclibs:
@ -85,5 +86,5 @@ Builds:
AutoUpdateMode: Version v%v AutoUpdateMode: Version v%v
UpdateCheckMode: HTTP UpdateCheckMode: HTTP
UpdateCheckData: https://version.pattle.im/|\ ([0-9]+)|.|([0-9]+\.[0-9]+\.[0-9]+) UpdateCheckData: https://version.pattle.im/|\ ([0-9]+)|.|([0-9]+\.[0-9]+\.[0-9]+)
CurrentVersion: 0.13.0 CurrentVersion: 0.12.0
CurrentVersionCode: 684 CurrentVersionCode: 677

View file

@ -68,6 +68,7 @@ Builds:
- versionName: 0.0.13 - versionName: 0.0.13
versionCode: 13 versionCode: 13
disable: fails to build
commit: 0.0.13 commit: 0.0.13
subdir: app subdir: app
gradle: gradle:
@ -75,5 +76,5 @@ Builds:
AutoUpdateMode: Version %v AutoUpdateMode: Version %v
UpdateCheckMode: Tags UpdateCheckMode: Tags
CurrentVersion: 0.0.13 CurrentVersion: 0.0.12
CurrentVersionCode: 13 CurrentVersionCode: 12

View file

@ -58,12 +58,12 @@ Builds:
- versionName: '2.9' - versionName: '2.9'
versionCode: 18 versionCode: 18
commit: v2.9 commit: '2.9'
subdir: morbidmeterandroid subdir: morbidmeterandroid
gradle: gradle:
- yes - yes
AutoUpdateMode: Version v%v AutoUpdateMode: Version %v
UpdateCheckMode: Tags UpdateCheckMode: Tags
CurrentVersion: '2.9' CurrentVersion: '2.9'
CurrentVersionCode: 18 CurrentVersionCode: 18

View file

@ -515,9 +515,9 @@ Builds:
linphone-sdk-android/ linphone-sdk-android/
ndk: r16b ndk: r16b
- versionName: 4.2.0-alpha - versionName: 4.2.0-beta
versionCode: 4127 versionCode: 4200
commit: 4.2.0-alpha commit: 4.2.0-beta
sudo: sudo:
- apt-get update || apt-get update - apt-get update || apt-get update
- apt-get install -y --no-install-recommends cmake -t stretch-backports - apt-get install -y --no-install-recommends cmake -t stretch-backports
@ -526,7 +526,7 @@ Builds:
- yes - yes
output: app/build/outputs/apk/release/linphone-android-release-*.apk output: app/build/outputs/apk/release/linphone-android-release-*.apk
srclibs: srclibs:
- linphone-sdk@4.3.0-alpha - linphone-sdk@4.3.0-beta
rm: rm:
- app/src/main/java/org/linphone/firebase/Firebase*.java - app/src/main/java/org/linphone/firebase/Firebase*.java
- app/google-services.json - app/google-services.json

View file

@ -785,7 +785,7 @@ Builds:
commit: v0.7.8.3 commit: v0.7.8.3
subdir: app subdir: app
gradle: gradle:
- yes - stable
AutoUpdateMode: Version v%v AutoUpdateMode: Version v%v
UpdateCheckMode: Tags UpdateCheckMode: Tags