From 7f9e6169eab9644ddea580be335b3b9547951367 Mon Sep 17 00:00:00 2001 From: linsui Date: Mon, 24 Oct 2022 01:51:16 +0800 Subject: [PATCH] misc fixes --- metadata/ca.rmen.android.poetassistant.yml | 14 ++++++-------- metadata/com.dozingcatsoftware.kumquats.yml | 1 + metadata/com.ensoft.imgurviewer.yml | 4 ---- metadata/cz.vitskalicky.lepsirozvrh.yml | 1 + metadata/de.blau.android.yml | 1 + metadata/de.hauke_stieler.geonotes.yml | 3 ++- metadata/de.spiritcroc.riotx.yml | 19 +++++++++---------- metadata/dev.atajan.lingva_android.yml | 4 ---- metadata/fr.ubordeaux.math.paridroid.yml | 1 + metadata/me.blog.korn123.easydiary.yml | 8 +------- metadata/me.konyaco.collinsdictionary.yml | 1 + metadata/org.billthefarmer.diary.yml | 4 ---- metadata/org.courville.nova.yml | 12 +++--------- metadata/org.mozilla.fennec_fdroid.yml | 2 ++ metadata/org.primftpd.yml | 1 + metadata/souch.smp.yml | 8 +++----- metadata/us.spotco.fennec_dos.yml | 2 ++ 17 files changed, 34 insertions(+), 52 deletions(-) diff --git a/metadata/ca.rmen.android.poetassistant.yml b/metadata/ca.rmen.android.poetassistant.yml index 7136930f08..02872323e1 100644 --- a/metadata/ca.rmen.android.poetassistant.yml +++ b/metadata/ca.rmen.android.poetassistant.yml @@ -2,7 +2,6 @@ Categories: - Writing License: GPL-3.0-only SourceCode: https://github.com/caarmen/poet-assistant -IssueTracker: https://github.com/caarmen/poet-assistant/issues Changelog: https://github.com/caarmen/poet-assistant/blob/HEAD/CHANGELOG.md AutoName: Poet Assistant @@ -536,15 +535,14 @@ Builds: gradle: - yes - - versionName: 1.30.4 - versionCode: 113004 - disable: https://monitor.f-droid.org/builds/log/ca.rmen.android.poetassistant/113004#site-footer - commit: 61085af0f01feddcaf5dda54241eea88f8ff0c06 + - versionName: 1.30.5 + versionCode: 113005 + commit: bf75b4f4877c3172731cf152b67b3d9c25edc0f4 subdir: app gradle: - yes -AutoUpdateMode: Version release-%v +AutoUpdateMode: Version UpdateCheckMode: Tags ^release- -CurrentVersion: 1.30.4 -CurrentVersionCode: 113004 +CurrentVersion: 1.30.5 +CurrentVersionCode: 113005 diff --git a/metadata/com.dozingcatsoftware.kumquats.yml b/metadata/com.dozingcatsoftware.kumquats.yml index 2b3b702dc0..802908a5ae 100644 --- a/metadata/com.dozingcatsoftware.kumquats.yml +++ b/metadata/com.dozingcatsoftware.kumquats.yml @@ -28,6 +28,7 @@ Builds: - versionName: 1.1.0 versionCode: 2 + disable: https://github.com/dozingcat/Kumquats/issues/6 commit: v1.1.0 output: build/app/outputs/apk/fdroid/release/app-fdroid-release.apk srclibs: diff --git a/metadata/com.ensoft.imgurviewer.yml b/metadata/com.ensoft.imgurviewer.yml index 2741523956..b1156be21f 100644 --- a/metadata/com.ensoft.imgurviewer.yml +++ b/metadata/com.ensoft.imgurviewer.yml @@ -94,10 +94,6 @@ Builds: versionCode: 23400 commit: 21f62dbeecf52e95f11b3aaba17c5afc29837213 subdir: app - sudo: - - apt-get update - - apt-get install -y openjdk-11-jdk-headless - - update-alternatives --auto java gradle: - yes diff --git a/metadata/cz.vitskalicky.lepsirozvrh.yml b/metadata/cz.vitskalicky.lepsirozvrh.yml index 5dfaf0b8f5..2fa161ab3f 100644 --- a/metadata/cz.vitskalicky.lepsirozvrh.yml +++ b/metadata/cz.vitskalicky.lepsirozvrh.yml @@ -147,6 +147,7 @@ Builds: - versionName: 1.8.5 versionCode: 33 + disable: https://gitlab.com/vitSkalicky/lepsi-rozvrh/-/issues/12 commit: e4060b8befbe03a8730ab2940ed609883710c8b6 subdir: app gradle: diff --git a/metadata/de.blau.android.yml b/metadata/de.blau.android.yml index c84356bd28..76143e31bd 100644 --- a/metadata/de.blau.android.yml +++ b/metadata/de.blau.android.yml @@ -1350,6 +1350,7 @@ Builds: - versionName: 18.0.3.0 versionCode: 2204 + disable: https://github.com/MarcusWolschon/osmeditor4android/issues/1895 commit: df16f19652d92927e83ff0ec0765ceac1e35dd39 gradle: - current diff --git a/metadata/de.hauke_stieler.geonotes.yml b/metadata/de.hauke_stieler.geonotes.yml index 0417d6e9b6..8cf113c102 100644 --- a/metadata/de.hauke_stieler.geonotes.yml +++ b/metadata/de.hauke_stieler.geonotes.yml @@ -113,12 +113,13 @@ Builds: - versionName: 1.5.0 versionCode: 1005000 + disable: https://github.com/hauke96/GeoNotes/issues/88 commit: 0939eef42de4c9792bb25024028a11b33a21f1d3 subdir: app gradle: - yes -AutoUpdateMode: Version v%v +AutoUpdateMode: Version UpdateCheckMode: Tags CurrentVersion: 1.5.0 CurrentVersionCode: 1005000 diff --git a/metadata/de.spiritcroc.riotx.yml b/metadata/de.spiritcroc.riotx.yml index 18723325c6..3bc10698c6 100644 --- a/metadata/de.spiritcroc.riotx.yml +++ b/metadata/de.spiritcroc.riotx.yml @@ -1147,17 +1147,15 @@ Builds: commit: b531fb523c9a16f1a5bdf27f00ba54314ba72ae7 subdir: vector-app sudo: + - apt-get update + - apt-get install -y jq libopus0 make g++ cmake maven + - curl -Lo node.tar.gz https://nodejs.org/dist/v16.17.1/node-v16.17.1-linux-x64.tar.gz + - echo "da5658693243b3ecf6a4cba6751a71df1eb9e9703ca93b42a9404aed85f58ad0 node.tar.gz" + | sha256sum -c - + - tar xzf node.tar.gz --strip-components=1 -C /usr/local/ + - sysctl fs.inotify.max_user_watches=524288 || true - cd /opt/android-sdk/ndk - rm -fr $(ls | sed 's/21.3.6528147//') - - curl -Lo node.tar.xz https://nodejs.org/dist/v16.14.2/node-v16.14.2-linux-x64.tar.xz - - echo "e40c6f81bfd078976d85296b5e657be19e06862497741ad82902d0704b34bb1b node.tar.xz" - | sha256sum -c - - - tar xJf node.tar.xz --strip-components=1 -C /usr/local/ - - apt-get update - - apt-get install -y -t stretch-backports jq openjdk-11-jdk-headless openjdk-11-jre-headless - libopus0 - - update-alternatives --auto java - - sysctl fs.inotify.max_user_watches=524288 || true patch: - build_gradle_remove_jitsi_repo_40104160.patch gradle: @@ -1166,6 +1164,7 @@ Builds: - jitsi-meet@android-sdk-5.0.2 - maplibre-gl-native@android-v9.5.2 prebuild: + - sed -i -e 's/def isCiBuild =.*/def isCiBuild = true/' ../tools/gradle/doctor.gradle - sed -i -e '/applicationIdSuffix/d' -e '/^repositories {/a mavenLocal()' build.gradle - sed -i -e 's/org.maplibre.gl/org.fdroid/' build.gradle $$maplibre-gl-native$$/platform/android/gradle/artifact-settings.gradle - pushd $$maplibre-gl-native$$/platform/android/MapboxGLAndroidSDK @@ -1202,7 +1201,7 @@ Builds: MaintainerNotes: AntiFeature NonFreeNet is added because each chat has a "Add Matrix apps" button which by default links to the proprietary scalar.vector.im service. -AutoUpdateMode: Version sc_v%v +AutoUpdateMode: Version UpdateCheckMode: Tags CurrentVersion: 1.5.2.sc61 CurrentVersionCode: 40100960 diff --git a/metadata/dev.atajan.lingva_android.yml b/metadata/dev.atajan.lingva_android.yml index 7a8c792a88..9e2fa18b94 100644 --- a/metadata/dev.atajan.lingva_android.yml +++ b/metadata/dev.atajan.lingva_android.yml @@ -27,10 +27,6 @@ Builds: versionCode: 16 commit: 9c107e2ea99dfe8e6f63377a55978a59da8f954e subdir: app - sudo: - - apt-get update - - apt-get install -y openjdk-11-jdk-headless - - update-alternatives --auto java gradle: - yes diff --git a/metadata/fr.ubordeaux.math.paridroid.yml b/metadata/fr.ubordeaux.math.paridroid.yml index 6e766c03c3..d9205c75db 100644 --- a/metadata/fr.ubordeaux.math.paridroid.yml +++ b/metadata/fr.ubordeaux.math.paridroid.yml @@ -257,6 +257,7 @@ Builds: - versionName: 2.15.0.2.2 versionCode: 26 + disable: AGP 4.1 issue commit: 2.15.0.2.2 subdir: PariDroid/app sudo: diff --git a/metadata/me.blog.korn123.easydiary.yml b/metadata/me.blog.korn123.easydiary.yml index beb2b13620..10e7cdfb8e 100644 --- a/metadata/me.blog.korn123.easydiary.yml +++ b/metadata/me.blog.korn123.easydiary.yml @@ -743,15 +743,9 @@ Builds: gradle: - foss - - versionName: 1.4.281.202210180 - versionCode: 281 - commit: e459c358f0881aa2b8c1b214cd4b0e966708c9c3 - subdir: app - gradle: - - foss - - versionName: 1.4.282.202210220 versionCode: 282 + disable: https://github.com/hanjoongcho/aaf-easydiary/issues/199 commit: b52897d86b2bea98253638118dce482d65f0eb21 subdir: app gradle: diff --git a/metadata/me.konyaco.collinsdictionary.yml b/metadata/me.konyaco.collinsdictionary.yml index 6b3f5966d6..1989c5a9ab 100644 --- a/metadata/me.konyaco.collinsdictionary.yml +++ b/metadata/me.konyaco.collinsdictionary.yml @@ -44,6 +44,7 @@ Builds: subdir: android gradle: - yes + prebuild: sed -i -e '/maven.pkg.jetbrains.space/d' build.gradle.kts settings.gradle.kts AutoUpdateMode: Version UpdateCheckMode: Tags diff --git a/metadata/org.billthefarmer.diary.yml b/metadata/org.billthefarmer.diary.yml index aa90c17ce0..1818fe0d52 100644 --- a/metadata/org.billthefarmer.diary.yml +++ b/metadata/org.billthefarmer.diary.yml @@ -610,10 +610,6 @@ Builds: - versionName: '1.92' versionCode: 192 commit: 2cb5437babc229b99a8c8f0d91ed65ae462d005a - sudo: - - apt-get update - - apt-get install -y openjdk-11-jdk - - update-alternatives --auto java gradle: - yes diff --git a/metadata/org.courville.nova.yml b/metadata/org.courville.nova.yml index 63d8cbd77d..d915fc96eb 100644 --- a/metadata/org.courville.nova.yml +++ b/metadata/org.courville.nova.yml @@ -686,14 +686,10 @@ Builds: submodules: true sudo: - apt-get update - - apt-get install -y -t testing nasm - - apt-get install -y ninja-build build-essential openjdk-11-jdk-headless python3-wheel - wget - - update-alternatives --auto java + - apt-get install -y ninja-build build-essential nasm python3-wheel wget - pip3 install meson==0.53.2 gradle: - noamazon - output: build/outputs/apk/noamazon/release/Video-universal-release-unsigned.apk rm: - native/torrentd/libs - native/dav1d-android-builder/build-* @@ -702,9 +698,7 @@ Builds: - FileCoreLibrary/libs/*jar - native/opus-android-builder/lib - native/openssl-android-builder/dist-* - prebuild: - - JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64 $$SDK$$/tools/bin/sdkmanager 'cmdline-tools;latest' - - $$SDK$$/cmdline-tools/latest/bin/sdkmanager 'cmake;3.18.1' + prebuild: sdkmanager 'cmake;3.18.1' ndk: r23b gradleprops: - universal @@ -716,7 +710,7 @@ MaintainerNotes: |- meson version is forced to 0.53.2 because 0.54.0 breaks dav1d's build. MediaLibs/libs/*.jar and FileCoreLibrary/libs/*.jar are built in prebuild gradle phase, generating a warning about jar blobs at end of the build. -AutoUpdateMode: Version v%v_c%c +AutoUpdateMode: Version UpdateCheckMode: Tags CurrentVersion: 6.0.75 CurrentVersionCode: 600075 diff --git a/metadata/org.mozilla.fennec_fdroid.yml b/metadata/org.mozilla.fennec_fdroid.yml index 17fdaec66d..83f5b6405e 100644 --- a/metadata/org.mozilla.fennec_fdroid.yml +++ b/metadata/org.mozilla.fennec_fdroid.yml @@ -12384,6 +12384,7 @@ Builds: - versionName: 106.1.0 versionCode: 1061000 + disable: build failed commit: v106.1.0 timeout: 18000 sudo: @@ -12407,6 +12408,7 @@ Builds: - versionName: 106.1.0 versionCode: 1061020 + disable: build failed commit: v106.1.0 timeout: 18000 sudo: diff --git a/metadata/org.primftpd.yml b/metadata/org.primftpd.yml index b36b19cd14..2ba967b5bb 100644 --- a/metadata/org.primftpd.yml +++ b/metadata/org.primftpd.yml @@ -368,6 +368,7 @@ Builds: - versionName: '6.15' versionCode: 61 + disable: https://github.com/wolpi/prim-ftpd/issues/284 commit: c504dc847e01e407635d1e0f6db668e5e9a47280 subdir: primitiveFTPd gradle: diff --git a/metadata/souch.smp.yml b/metadata/souch.smp.yml index 96f165a731..9b9176531a 100644 --- a/metadata/souch.smp.yml +++ b/metadata/souch.smp.yml @@ -253,13 +253,11 @@ Builds: versionCode: 28 commit: fd394ec7af5701ec2e0322a09abab17c66bc65e4 subdir: app - sudo: - - apt-get update - - apt-get install -y openjdk-11-jdk-headless - - update-alternatives --auto java gradle: - free - prebuild: sed -i -e '18a google()' ../build.gradle + prebuild: + - sed -i -e '18a google()' ../build.gradle + - echo 'android { lintOptions { isAbortOnError = false }}' >> build.gradle - versionName: '2.1' versionCode: 29 diff --git a/metadata/us.spotco.fennec_dos.yml b/metadata/us.spotco.fennec_dos.yml index d200b8b3fd..4881480f42 100644 --- a/metadata/us.spotco.fennec_dos.yml +++ b/metadata/us.spotco.fennec_dos.yml @@ -1128,6 +1128,7 @@ Builds: - versionName: 106.1.0 versionCode: 21061000 + disable: build failed commit: v106.1.0 timeout: 18000 sudo: @@ -1151,6 +1152,7 @@ Builds: - versionName: 106.1.0 versionCode: 21061020 + disable: build failed commit: v106.1.0 timeout: 18000 sudo: