misc fixes

This commit is contained in:
linsui 2024-05-12 15:18:55 +08:00
parent 40a52ab58b
commit 0cab904db3
10 changed files with 56 additions and 55 deletions

View file

@ -89,9 +89,9 @@ Builds:
prebuild: sed -i -r -e '/play(Api|Implementation)/d' -e '/wearable/d' build.gradle
ndk: 25.1.8937393
- versionName: 5.0.0
versionCode: 3020140
commit: 3486df488266a1df5c5aaef02daca8177eaf9555
- versionName: 5.0.1
versionCode: 3020141
commit: e056a250cf0a3226f0e72ec7ed1c463daaaf01c8
subdir: app
gradle:
- free
@ -100,5 +100,5 @@ Builds:
AutoUpdateMode: Version
UpdateCheckMode: Tags .*[0-9]$
CurrentVersion: 5.0.0
CurrentVersionCode: 3020140
CurrentVersion: 5.0.1
CurrentVersionCode: 3020141

View file

@ -16,13 +16,6 @@ Repo: https://github.com/DroidWorksStudio/EasyLauncher.git
Binaries: https://github.com/DroidWorksStudio/EasyLauncher/releases/download/%v/EasyLauncher-%v-Signed.apk
Builds:
- versionName: 0.0.1
versionCode: 1
commit: ece9fa05e773d2261efbd09b98a809580efb3271
subdir: app
gradle:
- yes
- versionName: 0.0.3
versionCode: 3
commit: a129e9410f556b7242c053e75d8b19b5bc3080c3

View file

@ -2975,6 +2975,7 @@ Builds:
- versionName: '1.5'
versionCode: 1018001
disable: https://github.com/balzack/databag/issues/98
commit: 1d271d2eb85dfe499e811a2638363f5d2ed50093
subdir: app/mobile/android/app
sudo:
@ -3033,6 +3034,7 @@ Builds:
- versionName: '1.5'
versionCode: 1018002
disable: https://github.com/balzack/databag/issues/98
commit: 1d271d2eb85dfe499e811a2638363f5d2ed50093
subdir: app/mobile/android/app
sudo:
@ -3091,6 +3093,7 @@ Builds:
- versionName: '1.5'
versionCode: 1018003
disable: https://github.com/balzack/databag/issues/98
commit: 1d271d2eb85dfe499e811a2638363f5d2ed50093
subdir: app/mobile/android/app
sudo:
@ -3149,6 +3152,7 @@ Builds:
- versionName: '1.5'
versionCode: 1018004
disable: https://github.com/balzack/databag/issues/98
commit: 1d271d2eb85dfe499e811a2638363f5d2ed50093
subdir: app/mobile/android/app
sudo:

View file

@ -18,13 +18,6 @@ Repo: https://github.com/davidtakac/bura/
Binaries: https://github.com/davidtakac/bura/releases/download/%v/bura-%v.apk
Builds:
- versionName: 1.3.0
versionCode: 10
commit: a0900e3ea274297ffdec0a117979216ee4a295ca
subdir: app
gradle:
- yes
- versionName: 1.4.0
versionCode: 11
commit: 393949732127bc507e226f156773fb8188395572

View file

@ -130,6 +130,7 @@ Builds:
- versionName: 2024.05.00
versionCode: 31
disable: https://codeberg.org/kaanelloed/Iconeration/issues/36
commit: d1e51de5a56bfea5df65fcb5ce12b6287f3896b7
subdir: app
submodules: true

View file

@ -1652,9 +1652,9 @@ Builds:
prebuild: sdkmanager 'cmake;3.10.2.4988404'
ndk: r23c
- versionName: 1.0.230
versionCode: 10230
commit: 839b051f0bc0283be340e62bd5ff589d1fd06b7e
- versionName: 1.0.231
versionCode: 10231
commit: 060029bff69f88b1f88da69ae0bbfb5aca28e815
subdir: android-refimpl-app/app
gradle:
- yes
@ -1667,5 +1667,5 @@ MaintainerNotes: |-
AutoUpdateMode: Version
UpdateCheckMode: Tags ^[0-9].*
CurrentVersion: 1.0.230
CurrentVersionCode: 10230
CurrentVersion: 1.0.231
CurrentVersionCode: 10231

View file

@ -789,7 +789,7 @@ Builds:
subdir: app
output: build/app/outputs/flutter-apk/app-production-release.apk
srclibs:
- flutter@3.16.4
- flutter@stable
rm:
- app/ios
- app/linux
@ -797,6 +797,7 @@ Builds:
- app/web
- app/windows
prebuild:
- git -C $$flutter$$ checkout -f $(cat ../FLUTTER_VERSION)
- export PUB_CACHE=$(pwd)/.pub-cache
- $$flutter$$/bin/flutter config --no-analytics
scandelete:

View file

@ -2211,18 +2211,21 @@ Builds:
NonFreeNet:
en-US: Tethered to developer server
- versionName: 0.8.94
versionCode: 614
commit: 0e33299863522773df26e4592bda4ca57d703e2a
- versionName: 0.8.95
versionCode: 615
commit: d16f98cf07a5104c1a249bbcdf3b896066dbecdf
subdir: mobile
submodules: true
sudo:
- apt-get update
- apt-get install -y automake libtool make
- apt-get install -y gcc-multilib libc-dev make automake pkg-config libtool
nasm python3-jsonschema wget meson python3-jinja2 zip
output: build/app/outputs/apk/fdroid/release/app-fdroid-release.apk
srclibs:
- libsodium@ee009287afd480b60a9a4d75b19afdc0f705e9d9
- transistor-background-fetch@6feb11c93f4e5debf7792e7e7c444f3d62ac733c
- media-kit-libmpv-android-video-build@v1.1.5
- mpv@056072bf958ffeaadd2f5a69e37f3079f18d4ead
rm:
- auth
- cli
@ -2235,6 +2238,16 @@ Builds:
- export PUB_CACHE=$(pwd)/.pub-cache
- thirdparty/flutter/bin/flutter config --no-analytics
- thirdparty/flutter/bin/flutter pub get
- export file=$(ls .pub-cache/hosted/pub.dev/media_kit_libs_android_video-*/android/build.gradle)
- export tag=$(sed -n -E 's|.*download/(v[0-9.]+)/.*|\1|p' $file | head -n 1)
- sed -i -e '/downloadDependencies/,/dependsOn/d' $file
- cd $$media-kit-libmpv-android-video-build$$
- git checkout -f $tag
- cd buildscripts
- sed -i -e 's/sudo//g' -e 's|./gradlew|gradle|g' *.sh
- sed -i -e '/download-sdk/d' download.sh
- sed -i -e '/mkdir -p deps/a mv $$mpv$$ mpv' include/download-deps.sh
- sed -i -e '/git reset --hard/d' patch.sh
scanignore:
- mobile/.pub-cache/hosted/pub.dev/background_fetch-*/android/build.gradle
- mobile/thirdparty/flutter/bin/cache
@ -2243,6 +2256,7 @@ Builds:
- mobile/.pub-cache
build:
- export PUB_CACHE=$(pwd)/.pub-cache
- export FLUTTER=$(pwd)/thirdparty/flutter/bin/
- pushd $$libsodium$$
- ./autogen.sh -s
- ./dist-build/android-armv7-a.sh
@ -2260,6 +2274,13 @@ Builds:
- popd
- mv $$transistor-background-fetch$$/android/tsbackgroundfetch/build/outputs/aar/tsbackgroundfetch-release.aar
$PUB_CACHE/hosted/pub.dev/background_fetch-1.3.2/android/libs/com/transistorsoft/tsbackgroundfetch/1.0.2/tsbackgroundfetch-1.0.2.aar
- pushd $$media-kit-libmpv-android-video-build$$/buildscripts
- mkdir sdk
- ln -s $$SDK$$ ./sdk/android-sdk-linux
- PATH=$FLUTTER:$PATH bash bundle_default.sh
- popd
- mkdir -p build/media_kit_libs_android_video/output
- cp $$media-kit-libmpv-android-video-build$$/output/default-*.jar build/media_kit_libs_android_video/output
- thirdparty/flutter/bin/flutter build apk --flavor fdroid -t lib/main.dart
ndk: 25.2.9519653
antifeatures:
@ -2270,5 +2291,5 @@ Builds:
AutoUpdateMode: Version
UpdateCheckMode: Tags ^fdroid-
UpdateCheckData: mobile/pubspec.yaml|version:\s.+\+(\d+)|.|version:\s(.+)\+
CurrentVersion: 0.8.94
CurrentVersionCode: 614
CurrentVersion: 0.8.95
CurrentVersionCode: 615

View file

@ -1062,12 +1062,12 @@ Builds:
submodules: true
sudo:
- apt-get update
- apt-get install -y ninja-build python3-pip xz-utils unzip g++ make libssl-dev
- apt-get install -y ninja-build pipx xz-utils unzip g++ make libssl-dev
- apt-get install -y cmake -t bookworm-backports
init: git revert -n c62d945b2d6e698becc16a02dc3cdd81238639c1
gradle:
- yes
srclibs:
- CMake@v3.27.6
- conan@1.60.1
prebuild:
- pushd ~
@ -1075,13 +1075,7 @@ Builds:
- sha256sum -c <<< '769ee342ea75f80619d985c2da990c48b3d8eaf45f48783a2d48870d04b46108
ndk.zip'
- popd
- pushd $$CMake$$
- mkdir build
- cd build
- ../bootstrap
- make
- popd
- pip install $$conan$$
- pipx install $$conan$$
- cd ../..
- export CONAN_USER_HOME="$(pwd)"
- export CONAN_USER_HOME_SHORT="$(pwd)"
@ -1124,12 +1118,12 @@ Builds:
submodules: true
sudo:
- apt-get update
- apt-get install -y ninja-build python3-pip xz-utils unzip g++ make libssl-dev
- apt-get install -y ninja-build pipx xz-utils unzip g++ make libssl-dev
- apt-get install -y cmake -t bookworm-backports
init: git revert -n c62d945b2d6e698becc16a02dc3cdd81238639c1
gradle:
- yes
srclibs:
- CMake@v3.27.6
- conan@1.60.1
prebuild:
- pushd ~
@ -1137,17 +1131,11 @@ Builds:
- sha256sum -c <<< '769ee342ea75f80619d985c2da990c48b3d8eaf45f48783a2d48870d04b46108
ndk.zip'
- popd
- pushd $$CMake$$
- mkdir build
- cd build
- ../bootstrap
- make
- popd
- pip install $$conan$$
- pipx install $$conan$$
- cd ../..
- export CONAN_USER_HOME="$(pwd)"
- export CONAN_USER_HOME_SHORT="$(pwd)"
- export PATH="${HOME}/.local/bin:$$CMake$$/build/bin:$PATH"
- export PATH="${HOME}/.local/bin:$PATH"
- mkdir .conan
- pushd .conan
- curl -Lo aarch64-v8a.txz https://github.com/vcmi/vcmi-dependencies/releases/download/android-1.0/aarch64-v8a.txz
@ -1169,7 +1157,7 @@ Builds:
- export GENERATE_ONLY_BUILT_CONFIG=1
- export CONAN_USER_HOME="$(pwd)"
- export CONAN_USER_HOME_SHORT="$(pwd)"
- export PATH="${HOME}/.local/bin:$$CMake$$/build/bin:$PATH"
- export PATH="${HOME}/.local/bin:$PATH"
- conan install . --install-folder=conan-generated --build --profile:build=default
--profile:host=CI/conan/android-64 -s compiler.cppstd=11
- echo "ndk.dir=$(eval echo ${CONAN_USER_HOME}/.conan/data/android-ndk/r25c/_/_/package/*/bin)"
@ -1188,10 +1176,6 @@ MaintainerNotes: |-
building dependencies. Conan is not available in bullseye repos, so we install
it from source with python-pip.
Additionally, VCMI requires cmake 3.27.6 (official docs say 3.20+, however it
yields various compilation errors). Bullseye backports repo doesn't have 3.27.6,
so we build it from source.
VCMI needs android-ndk-r25c supplied by conan to build. The NDK package in conan
uses official google NDK, but modifies it to work with conan. We download conan build
files for NDK and change the conan NDK package to provide our own android-ndk-r25c
@ -1219,6 +1203,9 @@ MaintainerNotes: |-
Builds split into a separate build for each architecture, with incremental version code (which must be reflected in both main "build" section and prebuild env variable).
"commit" section points to the commit of the launcher repo, while "VCMI_COMMIT" var points to commit of the upstream vcmi repo.
VCMI requires cmake 3.27.6 (official docs say 3.20+, however it yields various compilation errors). Bullseye backports repo doesn't have 3.27.6,
so we build it from source.
AutoUpdateMode: Version
UpdateCheckMode: Tags
VercodeOperation:

View file

@ -18,6 +18,7 @@ Binaries: https://github.com/casimir/frigoligo/releases/download/v%v/frigoligo-v
Builds:
- versionName: 1.0.9
versionCode: 30
disable: not reproducible
commit: v1.0.9
submodules: true
sudo: