misc fixes

This commit is contained in:
linsui 2024-06-23 16:04:13 +08:00
parent d33cefbc4e
commit 01a17e51b6
7 changed files with 26 additions and 65 deletions

View file

@ -49,7 +49,7 @@ Builds:
submodules: true
output: build/app/outputs/flutter-apk/app-release.apk
srclibs:
- transistor-background-fetch@fb883de16ff3fbaaaa5ce84d829911c8a5894d2
- transistor-background-fetch@0dd1457588ba031f11e9452f125144aac8a9b75f
rm:
- test
- docs
@ -57,11 +57,9 @@ Builds:
- export PUB_CACHE=$(pwd)/.pub-cache
- .flutter/bin/flutter config --no-analytics
- .flutter/bin/flutter pub get
- sed -i -e '/maven {/,/^ }/cmavenLocal()' android/build.gradle .pub-cache/hosted/pub.dev/background_fetch-*/android/build.gradle
scanignore:
- .flutter/packages/flutter_tools/gradle/flutter.gradle
- .flutter/bin/cache
- android/build.gradle
- .pub-cache/hosted/pub.dev/background_fetch-*/android/build.gradle
scandelete:
- .flutter
- .pub-cache
@ -69,9 +67,8 @@ Builds:
- export PUB_CACHE=$(pwd)/.pub-cache
- pushd $$transistor-background-fetch$$/android/tsbackgroundfetch/
- gradle assembleRelease
- gradle publishToMavenLocal
- popd
- mv $$transistor-background-fetch$$/android/tsbackgroundfetch/build/outputs/aar/tsbackgroundfetch-release.aar
$PUB_CACHE/hosted/pub.dev/background_fetch-1.1.5/android/libs/com/transistorsoft/tsbackgroundfetch/0.5.7/tsbackgroundfetch-0.5.7.aar
- .flutter/bin/flutter build apk
AutoUpdateMode: Version

View file

@ -370,16 +370,14 @@ Builds:
- versionName: 2.0.0
versionCode: 16
disable: https://github.com/boldtrn/graphhopper-maps-capacitor/issues/35
commit: 6f04686c54f1441f2673d5103e91933de95526fb
subdir: android/app
submodules: true
sudo:
- sysctl fs.inotify.max_user_watches=524288
- apt-get update
- curl -Lo node.tar.gz https://nodejs.org/dist/v16.20.1/node-v16.20.1-linux-x64.tar.gz
- echo "c76d2aabd2d02542505fd24e18876fb8515e23638531249277272def42ab54e3 node.tar.gz"
| sha256sum -c -
- tar xzf node.tar.gz --strip-components=1 -C /usr/local/
- apt-get install npm
init:
- cd ../..
- cp config.js graphhopper-maps/

View file

@ -13864,6 +13864,7 @@ Builds:
- versionName: '20240622'
versionCode: 20240622
disable: https://github.com/nextcloud/android/issues/13170
commit: fcb00aa03cfaaefc280a8fcd3615e95a6b834cd1
subdir: app
gradle:

View file

@ -64,7 +64,7 @@ Builds:
commit: e61bf9b652fbc9b0b3d92b1743fc2b8aafb508d6
subdir: app
gradle:
- yes
- lite
AllowedAPKSigningKeys: 57f09ab8dcfedbb63fa309362fedbbb0d8026cada8b2dc78ff00057f98c6020b

View file

@ -674,6 +674,7 @@ Builds:
- versionName: 1.3.2
versionCode: 30
disable: https://github.com/naoxio/inner_breeze/issues/32
commit: 7ebc66841047fa23bc0b15980db410ce0d9f1398
submodules: true
sudo:

View file

@ -1392,6 +1392,7 @@ Builds:
- versionName: 1.5.3
versionCode: 15310
disable: see https://github.com/vcmi/vcmi/pull/3817
commit: 099a491762c74907fafbd3a90846fe879c39ecbf
timeout: 30000
subdir: android/vcmi-app
@ -1400,17 +1401,11 @@ Builds:
- apt-get update
- 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:
- conan@1.60.1
prebuild:
- pushd ~
- curl -Lo ndk.zip https://dl.google.com/android/repository/android-ndk-r25c-linux.zip
- sha256sum -c <<< '769ee342ea75f80619d985c2da990c48b3d8eaf45f48783a2d48870d04b46108
ndk.zip'
- popd
- pipx install $$conan$$
- cd ../..
- export CONAN_USER_HOME="$(pwd)"
@ -1418,16 +1413,13 @@ Builds:
- export PATH="${HOME}/.local/bin:$$CMake$$/build/bin:$PATH"
- mkdir .conan
- pushd .conan
- curl -Lo armeabi-v7a.txz https://github.com/vcmi/vcmi-dependencies/releases/download/android-1.0/armeabi-v7a.txz
- sha256sum -c <<< 'e5a7df93703930d4e8783b8228cfdb28d73c3811d79522df8083231fea2ad00e armeabi-v7a.txz'
- curl -Lo armeabi-v7a.txz https://github.com/vcmi/vcmi-dependencies/releases/download/android-1.1/armeabi-v7a.txz
- sha256sum -c <<< 'b7a3c26530ef9e0deccc5d28fd9644985caa4d22bc6ee3613a6143034e7ed7eb armeabi-v7a.txz'
- tar -xf armeabi-v7a.txz
- rm armeabi-v7a.txz
- popd
- printf "[tool_requires]\nandroid-ndk/r25c" >> CI/conan/base/android
- conan profile new default --detect
- conan info . --profile:build=default --profile:host=CI/conan/android-32
- sed -i -e 's|https.*linux\.zip$|file:///home/vagrant/ndk.zip|' .conan/data/android-ndk/r25c/_/_/export/conandata.yml
- sed -i -e 's/minSdk.*$/minSdk 21/' android/vcmi-app/build.gradle
- sed -i -e 's/versionCode.*$/versionCode $$VERCODE$$/' android/vcmi-app/build.gradle
scandelete:
- .conan
@ -1439,15 +1431,15 @@ Builds:
- export CONAN_USER_HOME_SHORT="$(pwd)"
- export PATH="${HOME}/.local/bin:$$CMake$$/build/bin:$PATH"
- conan install . --install-folder=conan-generated --build --profile:build=default
--profile:host=CI/conan/android-32 -s compiler.cppstd=11
- echo "ndk.dir=$(eval echo ${CONAN_USER_HOME}/.conan/data/android-ndk/r25c/_/_/package/*/bin)"
>> android/local.properties
--profile:host=CI/conan/android-32 -s compiler.cppstd=11 -c tools.android:ndk_path=$$NDK$$
- mkdir build
- cmake -S . -B build -G Ninja -D CMAKE_BUILD_TYPE=Release -D CMAKE_TOOLCHAIN_FILE=conan-generated/conan_toolchain.cmake
- cmake --build build
ndk: r25c
- versionName: 1.5.3
versionCode: 15311
disable: see https://github.com/vcmi/vcmi/pull/3817
commit: 099a491762c74907fafbd3a90846fe879c39ecbf
timeout: 30000
subdir: android/vcmi-app
@ -1456,17 +1448,11 @@ Builds:
- apt-get update
- 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:
- conan@1.60.1
prebuild:
- pushd ~
- curl -Lo ndk.zip https://dl.google.com/android/repository/android-ndk-r25c-linux.zip
- sha256sum -c <<< '769ee342ea75f80619d985c2da990c48b3d8eaf45f48783a2d48870d04b46108
ndk.zip'
- popd
- pipx install $$conan$$
- cd ../..
- export CONAN_USER_HOME="$(pwd)"
@ -1474,16 +1460,13 @@ Builds:
- 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
- sha256sum -c <<< 'b41033513458e4658a628b35065c31144a50453a45e621ae4014fc8994d6e6c9 aarch64-v8a.txz'
- curl -Lo aarch64-v8a.txz https://github.com/vcmi/vcmi-dependencies/releases/download/android-1.1/aarch64-v8a.txz
- sha256sum -c <<< 'ea8d97b4ec714bbc19fe216e8a47f26ee23faeffceabc2c93adc6d4023eaa1ee aarch64-v8a.txz'
- tar -xf aarch64-v8a.txz
- rm aarch64-v8a.txz
- popd
- printf "[tool_requires]\nandroid-ndk/r25c" >> CI/conan/base/android
- conan profile new default --detect
- conan info . --profile:build=default --profile:host=CI/conan/android-64
- sed -i -e 's|https.*linux\.zip$|file:///home/vagrant/ndk.zip|' .conan/data/android-ndk/r25c/_/_/export/conandata.yml
- sed -i -e 's/minSdk.*$/minSdk 21/' android/vcmi-app/build.gradle
- sed -i -e 's/versionCode.*$/versionCode $$VERCODE$$/' android/vcmi-app/build.gradle
scandelete:
- .conan
@ -1495,19 +1478,13 @@ Builds:
- export CONAN_USER_HOME_SHORT="$(pwd)"
- 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)"
>> android/local.properties
--profile:host=CI/conan/android-64 -s compiler.cppstd=11 -c tools.android:ndk_path=$$NDK$$
- mkdir build
- cmake -S . -B build -G Ninja -D CMAKE_BUILD_TYPE=Release -D CMAKE_TOOLCHAIN_FILE=conan-generated/conan_toolchain.cmake
- cmake --build build
ndk: r25c
MaintainerNotes: |-
VCMI contains GMS dependencies to provide TLS support on android 4.4.
This dependency and code was introduced by a single commit, which is reverted
in the "init" section. Because of this, we also bump minSdk version to 21
(android 5.0).
VCMI requires conan version bigger than 1.54.0 (but not 2.x) for managing and
building dependencies. Conan is not available in bullseye repos, so we install
it from source with python-pip.
@ -1523,10 +1500,11 @@ MaintainerNotes: |-
provided by the upstream. They contain both binaries and source code, and also conan
build files for them, we remove binaries with scandelete. Additionally, a "--build"
flag is passed to conan to force rebuilding all dependencies (and their dependencies
and required build tools) from source.
and required build tools) from source. The dependencies are updated regularly. We need
to check that.
Upstream only provides armeabi-v7a and arm64-v8a builds, and there's conan profiles only
for these architectures.
for these architectures.
NDK is also required during 'gradle assemble' phase, otherwise gradle wont strip native libraries
and the resulting APK would be ~180 mb instead of ~25 mb. We reuse conan NDK for this.
@ -1542,6 +1520,11 @@ MaintainerNotes: |-
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 contains GMS dependencies to provide TLS support on android 4.4.
This dependency and code was introduced by a single commit, which is reverted
in the "init" section. Because of this, we also bump minSdk version to 21
(android 5.0).
AutoUpdateMode: Version
UpdateCheckMode: Tags
VercodeOperation:

View file

@ -21,25 +21,6 @@ Repo: https://github.com/techlore/Plexus-app.git
Binaries: https://github.com/techlore/Plexus-app/releases/download/v%v/Plexus_v%v.apk
Builds:
- versionName: 1.0.0
versionCode: 100
disable: switch to reproducible build
commit: v1.0.0
subdir: app
sudo:
- apt-get update
- apt-get install -y openjdk-11-jdk-headless
- update-alternatives --auto java
gradle:
- yes
- versionName: 2.0.3
versionCode: 203
commit: 1d295470b0c312d13732282b4bf54a9bf2f265cc
subdir: app
gradle:
- yes
- versionName: 2.0.3
versionCode: 203
commit: 1d295470b0c312d13732282b4bf54a9bf2f265cc