From a6daccc0167ae739eb5770cbbff86c5c2fb6c6bf Mon Sep 17 00:00:00 2001 From: F-Droid checkupdates bot Date: Tue, 12 Dec 2023 14:20:33 +0000 Subject: [PATCH] Update is.xyz.vcmi to 1.4.1 (14101) --- metadata/is.xyz.vcmi.yml | 128 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 126 insertions(+), 2 deletions(-) diff --git a/metadata/is.xyz.vcmi.yml b/metadata/is.xyz.vcmi.yml index 127eda92c9..53db88e1f6 100644 --- a/metadata/is.xyz.vcmi.yml +++ b/metadata/is.xyz.vcmi.yml @@ -558,6 +558,130 @@ Builds: - cmake -S . -B build -G Ninja -D CMAKE_BUILD_TYPE=Release -D CMAKE_TOOLCHAIN_FILE=conan-generated/conan_toolchain.cmake - cmake --build build + - versionName: 1.4.1 + versionCode: 14100 + commit: 17b2ce2c81eeeb2ac1c46c38f963da2e8ec1d0e4 + timeout: 30000 + subdir: android/vcmi-app + submodules: true + sudo: + - apt-get update + - apt-get install -y ninja-build python3-pip wget xz-utils unzip gcc g++ make + libssl-dev + init: git revert -n c62d945b2d6e698becc16a02dc3cdd81238639c1 + gradle: + - yes + prebuild: + - pushd ~ + - wget https://dl.google.com/android/repository/android-ndk-r25c-linux.zip + - sha256sum -c <<< '769ee342ea75f80619d985c2da990c48b3d8eaf45f48783a2d48870d04b46108 android-ndk-r25c-linux.zip' + - git clone https://github.com/Kitware/CMake + - cd CMake + - git reset --hard v3.27.6 + - mkdir build && cd build + - ../bootstrap && make + - cd ../.. + - git clone --recurse-submodules https://github.com/conan-io/conan + - pushd conan + - git reset --hard 1.60.1 + - pip install . + - popd && popd && cd ../.. + - export CONAN_USER_HOME="$(pwd)" + - export CONAN_USER_HOME_SHORT="$(pwd)" + - export PATH="${HOME}/.local/bin:${HOME}/CMake/build/bin:$PATH" + - mkdir .conan + - cd .conan + - wget https://github.com/vcmi/vcmi-dependencies/releases/download/android-1.0/armeabi-v7a.txz + - sha256sum -c <<< 'e5a7df93703930d4e8783b8228cfdb28d73c3811d79522df8083231fea2ad00e armeabi-v7a.txz' + - tar -xf armeabi-v7a.txz + - rm armeabi-v7a.txz + - cd .. + - 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/android-ndk-r25c-linux.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 + - osx + build: + - cd ../.. + - export GENERATE_ONLY_BUILT_CONFIG=1 + - export CONAN_USER_HOME="$(pwd)" + - export CONAN_USER_HOME_SHORT="$(pwd)" + - export PATH="${HOME}/.local/bin:${HOME}/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 + - 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 + + - versionName: 1.4.1 + versionCode: 14101 + commit: 17b2ce2c81eeeb2ac1c46c38f963da2e8ec1d0e4 + timeout: 30000 + subdir: android/vcmi-app + submodules: true + sudo: + - apt-get update + - apt-get install -y ninja-build python3-pip wget xz-utils unzip gcc g++ make + libssl-dev + init: git revert -n c62d945b2d6e698becc16a02dc3cdd81238639c1 + gradle: + - yes + prebuild: + - pushd ~ + - wget https://dl.google.com/android/repository/android-ndk-r25c-linux.zip + - sha256sum -c <<< '769ee342ea75f80619d985c2da990c48b3d8eaf45f48783a2d48870d04b46108 android-ndk-r25c-linux.zip' + - git clone https://github.com/Kitware/CMake + - cd CMake + - git reset --hard v3.27.6 + - mkdir build && cd build + - ../bootstrap && make + - cd ../.. + - git clone --recurse-submodules https://github.com/conan-io/conan + - pushd conan + - git reset --hard 1.60.1 + - pip install . + - popd && popd && cd ../.. + - export CONAN_USER_HOME="$(pwd)" + - export CONAN_USER_HOME_SHORT="$(pwd)" + - export PATH="${HOME}/.local/bin:${HOME}/CMake/build/bin:$PATH" + - mkdir .conan + - cd .conan + - wget https://github.com/vcmi/vcmi-dependencies/releases/download/android-1.0/aarch64-v8a.txz + - sha256sum -c <<< 'b41033513458e4658a628b35065c31144a50453a45e621ae4014fc8994d6e6c9 aarch64-v8a.txz' + - tar -xf aarch64-v8a.txz + - rm aarch64-v8a.txz + - cd .. + - 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/android-ndk-r25c-linux.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 + - osx + build: + - cd ../.. + - export GENERATE_ONLY_BUILT_CONFIG=1 + - export CONAN_USER_HOME="$(pwd)" + - export CONAN_USER_HOME_SHORT="$(pwd)" + - export PATH="${HOME}/.local/bin:${HOME}/CMake/build/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 + - 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 + 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 @@ -604,5 +728,5 @@ UpdateCheckMode: Tags VercodeOperation: - 10 * %c - 10 * %c + 1 -CurrentVersion: 1.4.0 -CurrentVersionCode: 14001 +CurrentVersion: 1.4.1 +CurrentVersionCode: 14101