From 2afa335b222d7f85a4382482bb75992c360b204b Mon Sep 17 00:00:00 2001 From: checkupdates bot <11877147-checkupdates-bot@users.noreply.gitlab.com> Date: Tue, 23 Sep 2025 05:08:04 +0000 Subject: [PATCH] Update SiYuan to 3.3.3 (282) --- metadata/org.b3log.siyuan.yml | 58 +++++++++++++++++++++++++++++++++-- 1 file changed, 56 insertions(+), 2 deletions(-) diff --git a/metadata/org.b3log.siyuan.yml b/metadata/org.b3log.siyuan.yml index 4ce84996b0..7108f8d92e 100644 --- a/metadata/org.b3log.siyuan.yml +++ b/metadata/org.b3log.siyuan.yml @@ -2581,8 +2581,62 @@ Builds: - mv $$siyuan$$/kernel/kernel.aar libs ndk: r27c + - versionName: 3.3.3 + versionCode: 282 + commit: 725db89a157ffd87f644bf5ba8c4525f3a515b58 + subdir: app + sudo: + - apt-get update + - apt-get install -t bookworm-backports -y golang-go + - apt-get install -y gcc libc-dev zip npm strip-nondeterminism + - npm install -g pnpm@v10.10.0 + gradle: + - official + srclibs: + - go@go1.24.1 + - siyuan@v3.0.17 + prebuild: + - sed -i -e '/aliyun/d' -e 's/8.12.1/8.11.1/' ../build.gradle + - sed -i -e '/signing/d' build.gradle + - sdkmanager "platforms;android-34" "build-tools;34.0.0" + - cd $$siyuan$$ + - git checkout -f 'v$$VERSION$$' + - sed -i -e '/CheckUpdate/a return' kernel/model/updater.go + - sed -i -e '/func GetRhyResult/a return nil, errors.New("rhy disabled for F-Droid")' + kernel/util/rhy.go + - sed -i -e '/DownloadInstallPkg/s/true/false/' kernel/conf/system.go + - GO_VERSION=$(sed -E -n 's/^go (.*)/\1/p' kernel/go.mod) + - '[[ $GO_VERSION ]]' + - git -C $$go$$ checkout -f go$GO_VERSION + - cd app + - pnpm install --no-frozen-lockfile + build: + - pushd $$go$$/src + - ./make.bash + - popd + - export GOPATH=$$go$$ + - export PATH="$GOPATH/bin:$PATH" + - pushd $$siyuan$$/app + - pnpm run build + - zip -r app appearance guide stage changelogs + - strip-nondeterminism -t zip app.zip + - popd + - mkdir -p src/main/assets/ + - mv $$siyuan$$/app/app.zip src/main/assets/ + - pushd $$siyuan$$/kernel + - go install golang.org/x/mobile/cmd/gomobile@v0.0.0-20250606033058-a2a15c67f36f + - go mod download + - gomobile init + - set JAVA_TOOL_OPTIONS=-Dfile.encoding=UTF-8 + - gomobile bind --tags fts5 -ldflags '-s -w' -v -o kernel.aar -target='android/arm64' + -androidapi 26 ./mobile/ + - popd + - mkdir libs + - mv $$siyuan$$/kernel/kernel.aar libs + ndk: r27c + AutoUpdateMode: Version UpdateCheckMode: Tags UpdateCheckData: build.gradle|siyuanVersionCode = (\d+)|.|siyuanVersionName = "([\d.]+)" -CurrentVersion: 3.3.2 -CurrentVersionCode: 281 +CurrentVersion: 3.3.3 +CurrentVersionCode: 282