misc fixes

This commit is contained in:
linsui 2024-03-20 18:44:07 +08:00
parent cc9965837b
commit a7fed97c30
4 changed files with 6 additions and 47 deletions

View file

@ -559,10 +559,6 @@ Builds:
versionCode: 2001
commit: caec57d8fdd94aa00abd851698b9784583c7e673
subdir: app
sudo:
- echo "deb https://deb.debian.org/debian bullseye main" > /etc/apt/sources.list.d/bullseye.list
- apt-get update
- apt-get install -y -t bullseye openjdk-11-jdk-headless
gradle:
- plus
binary: https://github.com/ammargitham/WallFlow/releases/download/v%v/app-plus-x86-release-signed.apk
@ -574,10 +570,6 @@ Builds:
versionCode: 2002
commit: caec57d8fdd94aa00abd851698b9784583c7e673
subdir: app
sudo:
- echo "deb https://deb.debian.org/debian bullseye main" > /etc/apt/sources.list.d/bullseye.list
- apt-get update
- apt-get install -y -t bullseye openjdk-11-jdk-headless
gradle:
- plus
binary: https://github.com/ammargitham/WallFlow/releases/download/v%v/app-plus-x86_64-release-signed.apk
@ -589,10 +581,6 @@ Builds:
versionCode: 2003
commit: caec57d8fdd94aa00abd851698b9784583c7e673
subdir: app
sudo:
- echo "deb https://deb.debian.org/debian bullseye main" > /etc/apt/sources.list.d/bullseye.list
- apt-get update
- apt-get install -y -t bullseye openjdk-11-jdk-headless
gradle:
- plus
binary: https://github.com/ammargitham/WallFlow/releases/download/v%v/app-plus-armeabi-v7a-release-signed.apk
@ -604,10 +592,6 @@ Builds:
versionCode: 2004
commit: caec57d8fdd94aa00abd851698b9784583c7e673
subdir: app
sudo:
- echo "deb https://deb.debian.org/debian bullseye main" > /etc/apt/sources.list.d/bullseye.list
- apt-get update
- apt-get install -y -t bullseye openjdk-11-jdk-headless
gradle:
- plus
binary: https://github.com/ammargitham/WallFlow/releases/download/v%v/app-plus-arm64-v8a-release-signed.apk

View file

@ -919,10 +919,6 @@ Builds:
versionCode: 2001
commit: caec57d8fdd94aa00abd851698b9784583c7e673
subdir: app
sudo:
- echo "deb https://deb.debian.org/debian bullseye main" > /etc/apt/sources.list.d/bullseye.list
- apt-get update
- apt-get install -y -t bullseye openjdk-11-jdk-headless
gradle:
- base
binary: https://github.com/ammargitham/WallFlow/releases/download/v%v/app-base-x86-release-signed.apk
@ -934,10 +930,6 @@ Builds:
versionCode: 2002
commit: caec57d8fdd94aa00abd851698b9784583c7e673
subdir: app
sudo:
- echo "deb https://deb.debian.org/debian bullseye main" > /etc/apt/sources.list.d/bullseye.list
- apt-get update
- apt-get install -y -t bullseye openjdk-11-jdk-headless
gradle:
- base
binary: https://github.com/ammargitham/WallFlow/releases/download/v%v/app-base-x86_64-release-signed.apk
@ -949,10 +941,6 @@ Builds:
versionCode: 2003
commit: caec57d8fdd94aa00abd851698b9784583c7e673
subdir: app
sudo:
- echo "deb https://deb.debian.org/debian bullseye main" > /etc/apt/sources.list.d/bullseye.list
- apt-get update
- apt-get install -y -t bullseye openjdk-11-jdk-headless
gradle:
- base
binary: https://github.com/ammargitham/WallFlow/releases/download/v%v/app-base-armeabi-v7a-release-signed.apk
@ -964,10 +952,6 @@ Builds:
versionCode: 2004
commit: caec57d8fdd94aa00abd851698b9784583c7e673
subdir: app
sudo:
- echo "deb https://deb.debian.org/debian bullseye main" > /etc/apt/sources.list.d/bullseye.list
- apt-get update
- apt-get install -y -t bullseye openjdk-11-jdk-headless
gradle:
- base
binary: https://github.com/ammargitham/WallFlow/releases/download/v%v/app-base-arm64-v8a-release-signed.apk

View file

@ -591,14 +591,13 @@ Builds:
- versionName: '27.0'
versionCode: 27000
disable: build stub first
commit: 2c6adbc69ba0e5dce09cd13c6d9aca5de30efe76
timeout: 30000
submodules: true
sudo:
- apt-get update
- apt-get install -y g++ make pkg-config libssl-dev ninja-build clang-14 cmake
lld-14 xz-utils libflashrom-dev libnss3-dev
- apt-get install -y g++ make pkg-config libssl-dev ninja-build clang cmake
lld xz-utils libflashrom-dev libnss3-dev
output: out/app-release.apk
srclibs:
- ondk@r26.3
@ -628,7 +627,7 @@ Builds:
- popd
- cp $$vboot$$/build/futility/futility tools
- pushd $$ondk$$
- PATH=/usr/lib/llvm-14/bin/:$PATH ./build.sh x86_64
- ./build.sh x86_64
- popd
- python3 ./build.py -rv ndk
- python3 ./build.py -rv binary

View file

@ -392,18 +392,13 @@ Builds:
subdir: app
sudo:
- apt-get update
- apt-get install -t bullseye-backports -y golang-go
- apt-get install -y gcc libc-dev zip
- curl -Lo node.tar.gz https://nodejs.org/dist/v20.11.0/node-v20.11.0-linux-x64.tar.gz
- echo "9556262f6cd4c020af027782afba31ca6d1a37e45ac0b56cecd2d5a4daf720e0 node.tar.gz"
| sha256sum -c -
- tar xzf node.tar.gz --strip-components=1 -C /usr/local/
- apt-get install -t bookworm-backports -y golang-go
- apt-get install -y gcc libc-dev zip npm
- npm install -g pnpm
gradle:
- yes
srclibs:
- siyuan@v2.12.6
- go@go1.21.6
prebuild:
- sed -i -e '/aliyun/d' ../build.gradle
- sdkmanager "platforms;android-34" "build-tools;34.0.0"
@ -421,10 +416,7 @@ Builds:
- popd
- mkdir -p src/main/assets/
- mv $$siyuan$$/app/app.zip src/main/assets/
- pushd $$go$$/src
- ./make.bash
- popd
- export GOPATH=$$go$$
- export GOPATH=$(pwd)
- export PATH="$GOPATH/bin:$PATH"
- pushd $$siyuan$$/kernel
- go install golang.org/x/mobile/cmd/gomobile@v0.0.0-20240112133503-c713f31d574b