misc fixes

This commit is contained in:
linsui 2022-07-22 15:19:12 +08:00
parent 81e45ffb19
commit 94aa3edd43
2 changed files with 3 additions and 52 deletions

View file

@ -134,18 +134,7 @@ Builds:
gradle:
- yes
- versionName: 0.1.7-beta2
versionCode: 18
commit: f9ca10d9a395e8ad05cb174c0256c61bc3e5a2f7
subdir: app
sudo:
- apt-get update || apt-get update
- apt-get install -y openjdk-11-jdk-headless
- update-alternatives --auto java
gradle:
- yes
AutoUpdateMode: Version
AutoUpdateMode: None
UpdateCheckMode: Tags
CurrentVersion: 0.1.7-beta2
CurrentVersionCode: 18

View file

@ -462,47 +462,9 @@ Builds:
- ./build.blocka.sh
ndk: r24
- versionName: 6.1.0
versionCode: 601000000
disable: https://github.com/blokadaorg/blokada/issues/943
commit: ea81890c3a46fbadde8256bfddb6053ac9b80fab
subdir: android5/app
submodules: true
sudo:
- apt-get update || apt-get update
- apt-get install -y openjdk-11-jdk-headless
- update-alternatives --auto java
gradle:
- droid
srclibs:
- rustup@1.24.3
rm:
- android5/app/src/engine/jniLibs
- android5/app/src/libre/jniLibs
prebuild:
- unzip -P default_blocklist src/libre/assets/default_blocklist.zip default_blocklist
-d src/libre/assets
- rm src/libre/assets/default_blocklist.zip
- sed -i -e 's/24.0.7856742/24.0.8215888/' build.gradle
build:
- $$rustup$$/rustup-init.sh -y
- source $HOME/.cargo/env
- rustup default 1.61.0
- rustup target add armv7-linux-androideabi
- rustup target add aarch64-linux-android
- cargo install cargo-ndk --version 1.0.0
- cd ../..
- curl -Lo ndk.zip https://dl.google.com/android/repository/android-ndk-r21e-linux-x86_64.zip
- echo "ad7ce5467e18d40050dc51b8e7affc3e635c85bd8c59be62de32352328ed467e ndk.zip"
| sha256sum -c -
- unzip -q ndk.zip
- export ANDROID_NDK=$(pwd)/android-ndk-r21e
- ./build.boringtun.sh
- ./build.blocka.sh
ndk: r24
- versionName: 6.2.0
versionCode: 602000000
disable: https://github.com/blokadaorg/blokada/issues/943
commit: 0debf947ff4c8d8b50dfb588f9cbdababd7d60fe
subdir: android5/app
submodules: true
@ -539,7 +501,7 @@ Builds:
- ./build.blocka.sh
ndk: r24
AutoUpdateMode: Version android-v%v
AutoUpdateMode: None
UpdateCheckMode: Tags ^android-v[0-9.]+$
CurrentVersion: 6.2.0
CurrentVersionCode: 602000000