From 2d14b237449570ca9c7b6c83b7f3cf4cc871fca5 Mon Sep 17 00:00:00 2001 From: linsui <2873532-linsui@users.noreply.gitlab.com> Date: Tue, 16 Sep 2025 19:23:54 +0800 Subject: [PATCH] misc fixes --- metadata/com.chiller3.rsaf.yml | 35 +----------------------- metadata/com.maksimowiczm.foodyou.yml | 10 +------ metadata/com.nextcloud.client.yml | 2 ++ metadata/com.starry.greenstash.yml | 1 + metadata/com.starry.myne.yml | 1 + metadata/com.yogeshpaliyal.deepr.yml | 2 +- metadata/name.boyle.chris.sgtpuzzles.yml | 16 ++--------- 7 files changed, 9 insertions(+), 58 deletions(-) diff --git a/metadata/com.chiller3.rsaf.yml b/metadata/com.chiller3.rsaf.yml index 4edbc3c986..5452e0e347 100644 --- a/metadata/com.chiller3.rsaf.yml +++ b/metadata/com.chiller3.rsaf.yml @@ -12,42 +12,9 @@ Repo: https://github.com/chenxiaolong/RSAF.git Binaries: https://github.com/chenxiaolong/RSAF/releases/download/v%v/RSAF-%v-arm64-v8a-release.apk Builds: - - versionName: '3.15' - versionCode: 200448 - commit: 2bc1e1f453a5c78156791e34f75ea67ad2a9a6c6 - subdir: app - sudo: - - echo "deb https://deb.debian.org/debian trixie main" > /etc/apt/sources.list.d/trixie.list - - apt-get update - - apt-get install -t bookworm-backports -y golang-go - - apt-get install -y -t trixie openjdk-21-jdk-headless - - update-alternatives --auto java - gradle: - - yes - srclibs: - - go@go1.25.1 - prebuild: - - sdkmanager "platforms;android-35" "build-tools;35.0.0" - - export GO_VERSION=$(sed -n 's/toolchain \(go.*\)/\1/p' ../rcbridge/go.mod) - - '[[ $GO_VERSION ]]' - - git -C $$go$$ checkout -f $GO_VERSION - - sed -i -e 's|-target=android|-target=android/arm64|' -e 's/include(.*)/include("arm64-v8a")/' - -e '/GOTOOLCHAIN/d' build.gradle.kts - scanignore: - - build.gradle.kts - - app/build.gradle.kts - build: - - pushd $$go$$/src - - ./make.bash - - popd - - export GOROOT=$$go$$ - - export GOPATH="$HOME/go" - - export PATH="$GOROOT/bin:$GOPATH/bin:$PATH" - - gradle rcbridge - ndk: r28b - - versionName: '3.16' versionCode: 200704 + disable: https://github.com/chenxiaolong/RSAF/issues/50 commit: 86c6481e601c5c4d87b429c69815d0de101307ff subdir: app sudo: diff --git a/metadata/com.maksimowiczm.foodyou.yml b/metadata/com.maksimowiczm.foodyou.yml index 11d844697e..e27070a1be 100644 --- a/metadata/com.maksimowiczm.foodyou.yml +++ b/metadata/com.maksimowiczm.foodyou.yml @@ -420,7 +420,7 @@ Builds: - apt-get update - apt-get install -y -t trixie openjdk-21-jdk-headless - update-alternatives --auto java - - export CPUS_MAX=16 + - export CPUS_MAX=4 - export CPUS=$(getconf _NPROCESSORS_ONLN) - for (( c=$CPUS_MAX; c<$CPUS; c++ )) ; do echo 0 > /sys/devices/system/cpu/cpu$c/online ; done @@ -429,14 +429,6 @@ Builds: scandelete: - platform/build-logic - FoodYouCore/build-logic - postbuild: - - curl -Lo upstream.apk https://github.com/maksimowiczm/FoodYou/releases/download/$$VERSION$$/food-you-$$VERSION$$.apk - - unzip -q upstream.apk -d apk - - export hash=$(sha256sum apk/assets/dexopt/baseline.prof) - - rm -rf apk upstream.apk - - for i in {1..10}; do unzip -q $$OUT$$ -d apk; sha256sum -c - <<< $hash && - break; sha256sum apk/assets/dexopt/baseline.prof; rm -fr apk; gradle clean - assembleRelease; done AllowedAPKSigningKeys: cd74b0aedd8ead8184063a65909d639a8c885cf6465829690a9be83a8904bdea diff --git a/metadata/com.nextcloud.client.yml b/metadata/com.nextcloud.client.yml index 760484211d..daefc145d9 100644 --- a/metadata/com.nextcloud.client.yml +++ b/metadata/com.nextcloud.client.yml @@ -1604,6 +1604,7 @@ Builds: - mkdir -p $HOME/.gradle - echo org.gradle.jvmargs=-Xmx9g -XX:MaxMetaspaceSize=512m -XX:+HeapDumpOnOutOfMemoryError > $HOME/.gradle/gradle.properties + - sed -i -e '/androidPluginVersion/s/8.13.0/8.11.1/' ../build.gradle scandelete: - app/src/androidTest/assets @@ -1619,6 +1620,7 @@ Builds: - mkdir -p $HOME/.gradle - echo org.gradle.jvmargs=-Xmx9g -XX:MaxMetaspaceSize=512m -XX:+HeapDumpOnOutOfMemoryError > $HOME/.gradle/gradle.properties + - sed -i -e '/androidPluginVersion/s/8.13.0/8.11.1/' ../build.gradle scandelete: - app/src/androidTest/assets diff --git a/metadata/com.starry.greenstash.yml b/metadata/com.starry.greenstash.yml index 4397b44f2e..9ede52e52f 100644 --- a/metadata/com.starry.greenstash.yml +++ b/metadata/com.starry.greenstash.yml @@ -254,6 +254,7 @@ Builds: subdir: app gradle: - yes + prebuild: sed -i -e 's/8.12.2/8.11.1/' ../build.gradle AutoUpdateMode: Version UpdateCheckMode: Tags diff --git a/metadata/com.starry.myne.yml b/metadata/com.starry.myne.yml index bba17b0498..e1aa3d8901 100644 --- a/metadata/com.starry.myne.yml +++ b/metadata/com.starry.myne.yml @@ -444,6 +444,7 @@ Builds: - versionName: 4.6.0 versionCode: 460 + disable: https://github.com/Pool-Of-Tears/Myne/issues/260 commit: 467754be3a703ab457f8f01b7a55fb8dc323f179 subdir: app gradle: diff --git a/metadata/com.yogeshpaliyal.deepr.yml b/metadata/com.yogeshpaliyal.deepr.yml index 71f93385a9..0000373bbf 100644 --- a/metadata/com.yogeshpaliyal.deepr.yml +++ b/metadata/com.yogeshpaliyal.deepr.yml @@ -52,7 +52,7 @@ Builds: subdir: app gradle: - free - build: taskset --cpu-list 0-15 gradle assembleRelease + build: taskset --cpu-list 0-7 gradle assembleRelease AllowedAPKSigningKeys: fea819bc3affd62731572044462abe340f6e288e4c2cad3c4f4d8b6cdfd8c04a diff --git a/metadata/name.boyle.chris.sgtpuzzles.yml b/metadata/name.boyle.chris.sgtpuzzles.yml index 82516e150a..ec56929f07 100644 --- a/metadata/name.boyle.chris.sgtpuzzles.yml +++ b/metadata/name.boyle.chris.sgtpuzzles.yml @@ -225,19 +225,6 @@ Builds: - sed -i '/versionName = timestamp/s/timestamp.*$/"$$VERSION$$"/' build.gradle.kts ndk: 25.1.8937393 - - versionName: 2025-09-06-1819-23762278-fdroid - versionCode: 148 - commit: 49f78fb3a447bd4a93f869be2beac091f8c7819d - subdir: app - gradle: - - yes - prebuild: - - sed -i '/{idForSimon()}/d' build.gradle.kts - - sed -i '/versionName = timestamp/s/timestamp.*$/"$$VERSION$$"/' build.gradle.kts - - sed -i -e 's/8.13.0/8.11.1/' ../build.gradle.kts ../buildSrc/build.gradle.kts - - sed -i -e '/foojay/d' ../settings.gradle.kts - ndk: 29.0.13846066 - - versionName: 2025-09-12-1919-23762278-fdroid versionCode: 149 commit: 8ec4ab867446837514ea35b17cf8f8ee1ed2d9b2 @@ -248,8 +235,9 @@ Builds: - sed -i '/{idForSimon()}/d' build.gradle.kts - sed -i '/versionName = timestamp/s/timestamp.*$/"$$VERSION$$"/' build.gradle.kts - sed -i -e 's/8.13.0/8.11.1/' ../build.gradle.kts ../buildSrc/build.gradle.kts + - sed -i -e 's/29.0.13846066/28.2.13676358/' build.gradle.kts - sed -i -e '/foojay/d' ../settings.gradle.kts - ndk: 29.0.13846066 + ndk: r28c MaintainerNotes: '* Check not only installation, but actual games to ensure correct JNI build.'