mirror of
https://github.com/sudoxnym/fdroiddata.git
synced 2026-05-19 20:29:15 +00:00
Merge branch 'ndk_bump' into 'master'
Bump NDK versions of missing builds after build server rebuild See merge request fdroid/fdroiddata!8597
This commit is contained in:
commit
a251cb7add
18 changed files with 23 additions and 62 deletions
|
|
@ -27,7 +27,7 @@ Builds:
|
|||
- sed -i -e 's/priv_daemon-release/priv_daemon-release-unsigned/' build.gradle
|
||||
- sed -i -e 's/pref_settings_check_for_updates_default">true/pref_settings_check_for_updates_default">false/'
|
||||
src/main/res/values/preference_keys.xml
|
||||
ndk: r21d
|
||||
ndk: r21e
|
||||
|
||||
AutoUpdateMode: Version %v
|
||||
UpdateCheckMode: Tags
|
||||
|
|
|
|||
|
|
@ -56,11 +56,12 @@ Builds:
|
|||
- sed -i 's/http:\/\/oss\.sonatype\.org\/content\/repositories\/snapshots/https:\/\/oss.sonatype.org\/content\/repositories\/snapshots\//'
|
||||
../build.gradle
|
||||
- rm -rf ../test-images
|
||||
- sed -i 's/21.3.6528147/21.4.7075529/' build.gradle
|
||||
scanignore:
|
||||
- tessdata
|
||||
scandelete:
|
||||
- .
|
||||
ndk: r21d
|
||||
ndk: r21e
|
||||
|
||||
MaintainerNotes: |-
|
||||
F-Droid scanner complains about sonatype repo because it misses a / at the end.
|
||||
|
|
|
|||
|
|
@ -55,7 +55,7 @@ Builds:
|
|||
output: app/build/outputs/apk/release/app-release-unsigned.apk
|
||||
build: ANDROID_SDK_HOME=$$SDK$$ ANDROID_SDK_ROOT=$$SDK$$ ANDROID_NDK_HOME=$$NDK$$
|
||||
./complete_build.sh
|
||||
ndk: r21d
|
||||
ndk: r21e
|
||||
|
||||
AutoUpdateMode: Version v%v
|
||||
UpdateCheckMode: Tags
|
||||
|
|
|
|||
|
|
@ -529,7 +529,7 @@ Builds:
|
|||
- make download-sources
|
||||
- make install-all
|
||||
- popd
|
||||
ndk: r21d
|
||||
ndk: r21e
|
||||
|
||||
MaintainerNotes: make download-sources checks out master branches of several libraries;
|
||||
this can cause build failures.
|
||||
|
|
|
|||
|
|
@ -1650,7 +1650,7 @@ Builds:
|
|||
- make download-sources
|
||||
- make install-all
|
||||
- popd
|
||||
ndk: r21d
|
||||
ndk: r21e
|
||||
|
||||
MaintainerNotes: make download-sources checks out master branches of several libraries;
|
||||
this can cause build failures.
|
||||
|
|
|
|||
|
|
@ -148,7 +148,7 @@ Builds:
|
|||
- Corona-Warn-App/src/main/assets/default_app_config_android.bin
|
||||
scandelete:
|
||||
- protobuf/build
|
||||
ndk: r21d
|
||||
ndk: r21e
|
||||
|
||||
MaintainerNotes: |-
|
||||
scanignored are some protobuf encoded config files, view them with:
|
||||
|
|
|
|||
|
|
@ -3776,7 +3776,7 @@ Builds:
|
|||
gradle:
|
||||
- fdroid
|
||||
prebuild: sed -i -e '/keystoreProperties/d' build.gradle
|
||||
ndk: r21d
|
||||
ndk: r21e
|
||||
|
||||
MaintainerNotes: Dynamic versionName and version code, so no autoupdates anymore.
|
||||
|
||||
|
|
|
|||
|
|
@ -1980,7 +1980,7 @@ Builds:
|
|||
prebuild: sed -i -e '/MissingTranslation/aabortOnError\ false' -e '/libwebrtc/d'
|
||||
-e "/phonenumber/aimplementation 'org.webrtc:google-webrtc:1.0.32006'" -e
|
||||
'/splits/,+5d' -e '/Variants.all/,+8d' build.gradle
|
||||
ndk: r21d
|
||||
ndk: r21e
|
||||
|
||||
MaintainerNotes: |-
|
||||
For 2.8.0 we replace the webrtc.aar with the latest M79 from maven, but
|
||||
|
|
|
|||
|
|
@ -478,7 +478,7 @@ Builds:
|
|||
prebuild: sed -i -e '/MissingTranslation/aabortOnError\ false' -e '/libwebrtc/d'
|
||||
-e "/phonenumber/aimplementation 'org.webrtc:google-webrtc:1.0.32006'" -e
|
||||
'/splits/,+5d' -e '/Variants.all/,+8d' build.gradle
|
||||
ndk: r21d
|
||||
ndk: r21e
|
||||
|
||||
AutoUpdateMode: None
|
||||
UpdateCheckMode: None
|
||||
|
|
|
|||
|
|
@ -553,7 +553,7 @@ Builds:
|
|||
gradle:
|
||||
- yes
|
||||
output: app/build/outputs/apk/release/remote-$$VERSION$$.apk
|
||||
ndk: r21d
|
||||
ndk: r21e
|
||||
|
||||
MaintainerNotes: The root build.gradle contains custom code that uses relative paths.
|
||||
Thus we cannot apply subdir.
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@ Builds:
|
|||
subdir: app
|
||||
gradle:
|
||||
- yes
|
||||
ndk: r21d
|
||||
ndk: r21e
|
||||
|
||||
AutoUpdateMode: Version %v
|
||||
UpdateCheckMode: Tags
|
||||
|
|
|
|||
|
|
@ -110,7 +110,7 @@ Builds:
|
|||
rm:
|
||||
- app/src/main/java/me/zhanghai/android/files/nonfree
|
||||
prebuild: find -type f -exec sed -i '/\/\/#ifdef NONFREE/,/\/\/#endif/d' {} +
|
||||
ndk: r21d
|
||||
ndk: r22
|
||||
|
||||
AutoUpdateMode: Version v%v
|
||||
UpdateCheckMode: Tags ^v.+$
|
||||
|
|
|
|||
|
|
@ -98,7 +98,7 @@ Builds:
|
|||
gradle:
|
||||
- full
|
||||
- world
|
||||
ndk: r21d
|
||||
ndk: r21e
|
||||
|
||||
AutoUpdateMode: Version %v
|
||||
UpdateCheckMode: Tags
|
||||
|
|
|
|||
|
|
@ -15,46 +15,6 @@ RepoType: git
|
|||
Repo: https://github.com/NekoX-Dev/NekoX
|
||||
|
||||
Builds:
|
||||
- versionName: 7.5.0-rc05
|
||||
versionCode: 211
|
||||
commit: v7.5.0-rc05
|
||||
timeout: 10800
|
||||
subdir: TMessagesProj
|
||||
submodules: true
|
||||
sudo: apt-get install -y ninja-build
|
||||
gradle:
|
||||
- fullFdroidArm
|
||||
output: build/outputs/apk/full/*/*.apk
|
||||
prebuild:
|
||||
- pushd ..
|
||||
- ./run fdroid prebuild
|
||||
scandelete:
|
||||
- TMessagesProj
|
||||
build:
|
||||
- pushd ..
|
||||
- ./run fdroid build
|
||||
ndk: r21d
|
||||
|
||||
- versionName: 7.5.0-rc05
|
||||
versionCode: 212
|
||||
commit: v7.5.0-rc05
|
||||
timeout: 10800
|
||||
subdir: TMessagesProj
|
||||
submodules: true
|
||||
sudo: apt-get install -y ninja-build
|
||||
gradle:
|
||||
- fullFdroidArm64
|
||||
output: build/outputs/apk/full/*/*.apk
|
||||
prebuild:
|
||||
- pushd ..
|
||||
- ./run fdroid prebuild
|
||||
scandelete:
|
||||
- TMessagesProj
|
||||
build:
|
||||
- pushd ..
|
||||
- ./run fdroid build
|
||||
ndk: r21d
|
||||
|
||||
- versionName: 7.5.0-rc10
|
||||
versionCode: 226
|
||||
commit: v7.5.0-rc10
|
||||
|
|
@ -73,7 +33,7 @@ Builds:
|
|||
build:
|
||||
- pushd ..
|
||||
- ./run fdroid build
|
||||
ndk: r21d
|
||||
ndk: r21e
|
||||
|
||||
- versionName: 7.5.0-rc10
|
||||
versionCode: 227
|
||||
|
|
@ -93,7 +53,7 @@ Builds:
|
|||
build:
|
||||
- pushd ..
|
||||
- ./run fdroid build
|
||||
ndk: r21d
|
||||
ndk: r21e
|
||||
|
||||
ArchivePolicy: 6 versions
|
||||
AutoUpdateMode: None
|
||||
|
|
|
|||
|
|
@ -116,7 +116,7 @@ Builds:
|
|||
- rm -rf src/main/cpp/openvpn3/test
|
||||
gradle:
|
||||
- fdroidProduction
|
||||
ndk: r21d
|
||||
ndk: r21e
|
||||
|
||||
AutoUpdateMode: Version v%v
|
||||
UpdateCheckMode: Tags
|
||||
|
|
|
|||
|
|
@ -217,7 +217,7 @@ Builds:
|
|||
- cd ./../..
|
||||
- ./build.boringtun.sh
|
||||
- ./build.blocka.sh
|
||||
ndk: r21d
|
||||
ndk: r21e
|
||||
|
||||
AutoUpdateMode: Version android-v%v
|
||||
UpdateCheckMode: Tags
|
||||
|
|
|
|||
|
|
@ -1861,7 +1861,7 @@ Builds:
|
|||
- TMessagesProj/jni/ffmpeg/tests/ref/fate/sub-microdvd-remux
|
||||
prebuild:
|
||||
- echo -e 'APP_ID = 12834\nAPP_HASH = c84d9229db1d6be95c067b02b126352c' > API_KEYS
|
||||
- sed -i -e 's/21.1.6352462/21.3.6528147/' build.gradle
|
||||
- sed -i -e 's/21.1.6352462/21.4.7075529/' build.gradle
|
||||
scandelete:
|
||||
- TMessagesProj/jni
|
||||
build:
|
||||
|
|
@ -1873,7 +1873,7 @@ Builds:
|
|||
- ./patch_boringssl.sh
|
||||
- ./build_boringssl.sh
|
||||
- popd
|
||||
ndk: r21d
|
||||
ndk: r21e
|
||||
|
||||
- versionName: 7.5.0
|
||||
versionCode: 22465
|
||||
|
|
@ -1889,7 +1889,7 @@ Builds:
|
|||
- TMessagesProj/jni/ffmpeg/tests/ref/fate/sub-microdvd-remux
|
||||
prebuild:
|
||||
- echo -e 'APP_ID = 12834\nAPP_HASH = c84d9229db1d6be95c067b02b126352c' > API_KEYS
|
||||
- sed -i -e 's/21.1.6352462/21.3.6528147/' build.gradle
|
||||
- sed -i -e 's/21.1.6352462/21.4.7075529/' build.gradle
|
||||
scandelete:
|
||||
- TMessagesProj/jni
|
||||
build:
|
||||
|
|
@ -1901,7 +1901,7 @@ Builds:
|
|||
- ./patch_boringssl.sh
|
||||
- ./build_boringssl.sh
|
||||
- popd
|
||||
ndk: r21d
|
||||
ndk: r21e
|
||||
|
||||
MaintainerNotes: |-
|
||||
Summary and Description have been moved to the new localizable text files:
|
||||
|
|
|
|||
|
|
@ -52,7 +52,7 @@ Builds:
|
|||
- popd
|
||||
- ANDROID_SDK_ROOT=$$SDK$$ ANDROID_NDK_ROOT=$$NDK$$ gogio -target android -version
|
||||
3 -appid st.wow.git.hrm .
|
||||
ndk: r21d
|
||||
ndk: r21e
|
||||
|
||||
AutoUpdateMode: None
|
||||
UpdateCheckMode: None
|
||||
|
|
|
|||
Loading…
Reference in a new issue