misc fixes

This commit is contained in:
linsui 2023-12-26 04:29:08 +08:00
parent e97058abc6
commit 637cdc5798
6 changed files with 59 additions and 62 deletions

View File

@ -115,13 +115,14 @@ Builds:
commit: d7da13f2bb16f81f070d8e5b011fc2dc385a19d7 commit: d7da13f2bb16f81f070d8e5b011fc2dc385a19d7
subdir: app subdir: app
submodules: true submodules: true
sudo:
- apt-get update
- apt-get install -y openjdk-17-jdk-headless
- update-alternatives --auto java
gradle: gradle:
- yes - foss
prebuild: prebuild: sed -i -e 's/21.0.6113669/21.4.7075529/' ../ci-scripts/setup_sdk.sh
- sed -i -e 's/21.0.6113669/21.3.6528147/' ../ci-scripts/setup_sdk.sh ../dmg2img/build.gradle ndk: r21e
- sed -i -e 's/4.1.1/4.2.0/' ../build.gradle
- sed -i -e 's/gradle-6.5/gradle-6.7.1/' ../gradle/wrapper/gradle-wrapper.properties
ndk: r21d
AutoUpdateMode: Version AutoUpdateMode: Version
UpdateCheckMode: Tags UpdateCheckMode: Tags

View File

@ -690,32 +690,32 @@ Builds:
submodules: true submodules: true
sudo: sudo:
- apt-get update - apt-get update
- apt-get install -y ninja-build python3-pip wget xz-utils unzip gcc g++ make - apt-get install -y ninja-build python3-pip xz-utils unzip g++ make libssl-dev
libssl-dev
init: git revert -n c62d945b2d6e698becc16a02dc3cdd81238639c1 init: git revert -n c62d945b2d6e698becc16a02dc3cdd81238639c1
gradle: gradle:
- yes - yes
srclibs:
- CMake@v3.27.6
- conan@1.60.1
prebuild: prebuild:
- pushd ~ - pushd ~
- wget https://dl.google.com/android/repository/android-ndk-r25c-linux.zip - curl -Lo ndk.zip https://dl.google.com/android/repository/android-ndk-r25c-linux.zip
- sha256sum -c <<< '769ee342ea75f80619d985c2da990c48b3d8eaf45f48783a2d48870d04b46108 android-ndk-r25c-linux.zip' - sha256sum -c <<< '769ee342ea75f80619d985c2da990c48b3d8eaf45f48783a2d48870d04b46108
- git clone https://github.com/Kitware/CMake ndk.zip'
- cd CMake - popd
- git reset --hard v3.27.6 - pushd $$CMake$$
- mkdir build && cd build - mkdir build
- ../bootstrap && make - cd build
- cd ../.. - ../bootstrap
- git clone --recurse-submodules https://github.com/conan-io/conan - make
- pushd conan - popd
- git reset --hard 1.60.1 - pip install $$conan$$
- pip install .
- popd && popd && cd ../..
- export CONAN_USER_HOME="$(pwd)" - export CONAN_USER_HOME="$(pwd)"
- export CONAN_USER_HOME_SHORT="$(pwd)" - export CONAN_USER_HOME_SHORT="$(pwd)"
- export PATH="${HOME}/.local/bin:${HOME}/CMake/build/bin:$PATH" - export PATH="${HOME}/.local/bin:$$CMake$$/build/bin:$PATH"
- mkdir .conan - mkdir .conan
- cd .conan - cd .conan
- wget https://github.com/vcmi/vcmi-dependencies/releases/download/android-1.0/armeabi-v7a.txz - 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' - sha256sum -c <<< 'e5a7df93703930d4e8783b8228cfdb28d73c3811d79522df8083231fea2ad00e armeabi-v7a.txz'
- tar -xf armeabi-v7a.txz - tar -xf armeabi-v7a.txz
- rm armeabi-v7a.txz - rm armeabi-v7a.txz
@ -723,8 +723,7 @@ Builds:
- printf "[tool_requires]\nandroid-ndk/r25c" >> CI/conan/base/android - printf "[tool_requires]\nandroid-ndk/r25c" >> CI/conan/base/android
- conan profile new default --detect - conan profile new default --detect
- conan info . --profile:build=default --profile:host=CI/conan/android-32 - 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|' - sed -i -e 's|https.*linux\.zip$|file:///home/vagrant/ndk.zip|' .conan/data/android-ndk/r25c/_/_/export/conandata.yml
.conan/data/android-ndk/r25c/_/_/export/conandata.yml
- sed -i -e 's/minSdk.*$/minSdk 21/' android/vcmi-app/build.gradle - sed -i -e 's/minSdk.*$/minSdk 21/' android/vcmi-app/build.gradle
- sed -i -e 's/versionCode.*$/versionCode $$VERCODE$$/' android/vcmi-app/build.gradle - sed -i -e 's/versionCode.*$/versionCode $$VERCODE$$/' android/vcmi-app/build.gradle
scandelete: scandelete:
@ -735,7 +734,7 @@ Builds:
- export GENERATE_ONLY_BUILT_CONFIG=1 - export GENERATE_ONLY_BUILT_CONFIG=1
- export CONAN_USER_HOME="$(pwd)" - export CONAN_USER_HOME="$(pwd)"
- export CONAN_USER_HOME_SHORT="$(pwd)" - export CONAN_USER_HOME_SHORT="$(pwd)"
- export PATH="${HOME}/.local/bin:${HOME}/CMake/build/bin:$PATH" - export PATH="${HOME}/.local/bin:$$CMake$$/build/bin:$PATH"
- conan install . --install-folder=conan-generated --build --profile:build=default - conan install . --install-folder=conan-generated --build --profile:build=default
--profile:host=CI/conan/android-32 -s compiler.cppstd=11 --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)" - echo "ndk.dir=$(eval echo ${CONAN_USER_HOME}/.conan/data/android-ndk/r25c/_/_/package/*/bin)"
@ -752,32 +751,32 @@ Builds:
submodules: true submodules: true
sudo: sudo:
- apt-get update - apt-get update
- apt-get install -y ninja-build python3-pip wget xz-utils unzip gcc g++ make - apt-get install -y ninja-build python3-pip xz-utils unzip g++ make libssl-dev
libssl-dev
init: git revert -n c62d945b2d6e698becc16a02dc3cdd81238639c1 init: git revert -n c62d945b2d6e698becc16a02dc3cdd81238639c1
gradle: gradle:
- yes - yes
srclibs:
- CMake@v3.27.6
- conan@1.60.1
prebuild: prebuild:
- pushd ~ - pushd ~
- wget https://dl.google.com/android/repository/android-ndk-r25c-linux.zip - curl -Lo ndk.zip https://dl.google.com/android/repository/android-ndk-r25c-linux.zip
- sha256sum -c <<< '769ee342ea75f80619d985c2da990c48b3d8eaf45f48783a2d48870d04b46108 android-ndk-r25c-linux.zip' - sha256sum -c <<< '769ee342ea75f80619d985c2da990c48b3d8eaf45f48783a2d48870d04b46108
- git clone https://github.com/Kitware/CMake ndk.zip'
- cd CMake - popd
- git reset --hard v3.27.6 - pushd $$CMake$$
- mkdir build && cd build - mkdir build
- ../bootstrap && make - cd build
- cd ../.. - ../bootstrap
- git clone --recurse-submodules https://github.com/conan-io/conan - make
- pushd conan - popd
- git reset --hard 1.60.1 - pip install $$conan$$
- pip install .
- popd && popd && cd ../..
- export CONAN_USER_HOME="$(pwd)" - export CONAN_USER_HOME="$(pwd)"
- export CONAN_USER_HOME_SHORT="$(pwd)" - export CONAN_USER_HOME_SHORT="$(pwd)"
- export PATH="${HOME}/.local/bin:${HOME}/CMake/build/bin:$PATH" - export PATH="${HOME}/.local/bin:$$CMake$$/build/bin:$PATH"
- mkdir .conan - mkdir .conan
- cd .conan - cd .conan
- wget https://github.com/vcmi/vcmi-dependencies/releases/download/android-1.0/aarch64-v8a.txz - 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' - sha256sum -c <<< 'b41033513458e4658a628b35065c31144a50453a45e621ae4014fc8994d6e6c9 aarch64-v8a.txz'
- tar -xf aarch64-v8a.txz - tar -xf aarch64-v8a.txz
- rm aarch64-v8a.txz - rm aarch64-v8a.txz
@ -785,8 +784,7 @@ Builds:
- printf "[tool_requires]\nandroid-ndk/r25c" >> CI/conan/base/android - printf "[tool_requires]\nandroid-ndk/r25c" >> CI/conan/base/android
- conan profile new default --detect - conan profile new default --detect
- conan info . --profile:build=default --profile:host=CI/conan/android-64 - 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|' - sed -i -e 's|https.*linux\.zip$|file:///home/vagrant/ndk.zip|' .conan/data/android-ndk/r25c/_/_/export/conandata.yml
.conan/data/android-ndk/r25c/_/_/export/conandata.yml
- sed -i -e 's/minSdk.*$/minSdk 21/' android/vcmi-app/build.gradle - sed -i -e 's/minSdk.*$/minSdk 21/' android/vcmi-app/build.gradle
- sed -i -e 's/versionCode.*$/versionCode $$VERCODE$$/' android/vcmi-app/build.gradle - sed -i -e 's/versionCode.*$/versionCode $$VERCODE$$/' android/vcmi-app/build.gradle
scandelete: scandelete:
@ -797,7 +795,7 @@ Builds:
- export GENERATE_ONLY_BUILT_CONFIG=1 - export GENERATE_ONLY_BUILT_CONFIG=1
- export CONAN_USER_HOME="$(pwd)" - export CONAN_USER_HOME="$(pwd)"
- export CONAN_USER_HOME_SHORT="$(pwd)" - export CONAN_USER_HOME_SHORT="$(pwd)"
- export PATH="${HOME}/.local/bin:${HOME}/CMake/build/bin:$PATH" - export PATH="${HOME}/.local/bin:$$CMake$$/build/bin:$PATH"
- conan install . --install-folder=conan-generated --build --profile:build=default - conan install . --install-folder=conan-generated --build --profile:build=default
--profile:host=CI/conan/android-64 -s compiler.cppstd=11 --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)" - echo "ndk.dir=$(eval echo ${CONAN_USER_HOME}/.conan/data/android-ndk/r25c/_/_/package/*/bin)"

View File

@ -116,10 +116,15 @@ Builds:
commit: 55e74b82f6e2cf1688a41ec89b4af4e3b8327ba7 commit: 55e74b82f6e2cf1688a41ec89b4af4e3b8327ba7
output: build/app/outputs/apk/fdroid/release/app-fdroid-release.apk output: build/app/outputs/apk/fdroid/release/app-fdroid-release.apk
srclibs: srclibs:
- flutter@1.17.5 - flutter@3.16.4
prebuild: sed -i -e 's|git@github.com:|https://github.com/|' pubspec.lock pubspec.yaml prebuild:
build: - export PUB_CACHE=$(pwd)/.pub-cache
- $$flutter$$/bin/flutter config --no-analytics - $$flutter$$/bin/flutter config --no-analytics
- $$flutter$$/bin/flutter pub get
scandelete:
- .pub-cache
build:
- export PUB_CACHE=$(pwd)/.pub-cache
- $$flutter$$/bin/flutter build apk --flavor fdroid - $$flutter$$/bin/flutter build apk --flavor fdroid
MaintainerNotes: |- MaintainerNotes: |-

View File

@ -122,19 +122,6 @@ Builds:
gradle: gradle:
- yes - yes
- versionName: 0.16.1
versionCode: 16
commit: a89901345e01f7e06ea9599cd34311dd5fd8a213
subdir: gauguin-app
sudo:
- apt-get update
- apt-get install -y openjdk-17-jdk-headless
- update-alternatives --auto java
gradle:
- yes
gradleprops:
- buildserver
AllowedAPKSigningKeys: e3b52addda7ef701e1a42e0bc3b8b4443a5eb29cbf62a47492b9ee697438da62 AllowedAPKSigningKeys: e3b52addda7ef701e1a42e0bc3b8b4443a5eb29cbf62a47492b9ee697438da62
AutoUpdateMode: Version AutoUpdateMode: Version

2
srclibs/CMake.yml Normal file
View File

@ -0,0 +1,2 @@
RepoType: git
Repo: https://github.com/Kitware/CMake.git

4
srclibs/conan.yml Normal file
View File

@ -0,0 +1,4 @@
RepoType: git
Repo: https://github.com/conan-io/conan.git
Prepare: git submodule update --init --recursive