From 9e91f8f0ef666b185ec0ec6d48321c199c71d730 Mon Sep 17 00:00:00 2001 From: linsui Date: Sun, 10 Dec 2023 19:26:28 +0800 Subject: [PATCH] misc fixes --- metadata/co.prestosole.clima.yml | 12 ++++++++++++ metadata/com.android.geto.yml | 1 + metadata/com.gokadzev.musify.fdroid.yml | 10 +++++----- metadata/de.spiritcroc.riotx.yml | 4 ---- metadata/eu.hydrologis.smash.yml | 1 + metadata/fr.nocle.passegares.yml | 4 ++++ metadata/org.handmadeideas.floccus.yml | 11 +++++------ 7 files changed, 28 insertions(+), 15 deletions(-) diff --git a/metadata/co.prestosole.clima.yml b/metadata/co.prestosole.clima.yml index cce207c7ac..653f9ea508 100644 --- a/metadata/co.prestosole.clima.yml +++ b/metadata/co.prestosole.clima.yml @@ -403,6 +403,10 @@ Builds: versionCode: 181 commit: 8b5854c2e7cb9abb1c6e3d0ad4c40fb8f614a7b9 submodules: true + sudo: + - apt-get update + - apt-get install -y openjdk-17-jdk-headless + - update-java-alternatives -a output: build/app/outputs/flutter-apk/app-*-release.apk prebuild: - export PUB_CACHE=$(pwd)/.pub-cache @@ -421,6 +425,10 @@ Builds: versionCode: 182 commit: 8b5854c2e7cb9abb1c6e3d0ad4c40fb8f614a7b9 submodules: true + sudo: + - apt-get update + - apt-get install -y openjdk-17-jdk-headless + - update-java-alternatives -a output: build/app/outputs/flutter-apk/app-*-release.apk prebuild: - export PUB_CACHE=$(pwd)/.pub-cache @@ -439,6 +447,10 @@ Builds: versionCode: 183 commit: 8b5854c2e7cb9abb1c6e3d0ad4c40fb8f614a7b9 submodules: true + sudo: + - apt-get update + - apt-get install -y openjdk-17-jdk-headless + - update-java-alternatives -a output: build/app/outputs/flutter-apk/app-*-release.apk prebuild: - export PUB_CACHE=$(pwd)/.pub-cache diff --git a/metadata/com.android.geto.yml b/metadata/com.android.geto.yml index 72cf7efc2e..c037d28df6 100644 --- a/metadata/com.android.geto.yml +++ b/metadata/com.android.geto.yml @@ -41,6 +41,7 @@ Builds: - versionName: '1.5' versionCode: 5 + disable: https://github.com/JackEblan/Geto/issues/7 commit: 5b6a2c27869fa10b504c083af69c8653e34c720a subdir: app sudo: diff --git a/metadata/com.gokadzev.musify.fdroid.yml b/metadata/com.gokadzev.musify.fdroid.yml index 646709c08a..e9ff4e3a30 100644 --- a/metadata/com.gokadzev.musify.fdroid.yml +++ b/metadata/com.gokadzev.musify.fdroid.yml @@ -601,9 +601,9 @@ Builds: - popd - mv $HOME/work/Musify/Musify com.gokadzev.musify.fdroid - - versionName: 7.0.0 - versionCode: 72 - commit: 29ea597d341f2ca51f4c621a86cfceafd1771eb3 + - versionName: 7.0.1 + versionCode: 73 + commit: fdbd8d65b9712006166aebdbbdcc8e4de3eddf20 sudo: - apt-get update - apt-get install -y jq python3-pip @@ -645,5 +645,5 @@ AllowedAPKSigningKeys: a3fdd79dae938381b8582553b1382f96f1bc78a3b7028ffd07ec061c1 AutoUpdateMode: Version UpdateCheckMode: Tags UpdateCheckData: pubspec.yaml|version:\s.+\+(\d+)|.|version:\s(.+)\+ -CurrentVersion: 7.0.0 -CurrentVersionCode: 72 +CurrentVersion: 7.0.1 +CurrentVersionCode: 73 diff --git a/metadata/de.spiritcroc.riotx.yml b/metadata/de.spiritcroc.riotx.yml index cc88774ebc..2ce9c213aa 100644 --- a/metadata/de.spiritcroc.riotx.yml +++ b/metadata/de.spiritcroc.riotx.yml @@ -2110,7 +2110,6 @@ Builds: - tar xzf node.tar.gz --strip-components=1 -C /usr/local/ gradle: - fdroid - - rustCrypto srclibs: - jitsi-meet@android-sdk-8.1.1 prebuild: @@ -2145,7 +2144,6 @@ Builds: - tar xzf node.tar.gz --strip-components=1 -C /usr/local/ gradle: - fdroid - - rustCrypto srclibs: - jitsi-meet@android-sdk-8.1.1 prebuild: @@ -2180,7 +2178,6 @@ Builds: - tar xzf node.tar.gz --strip-components=1 -C /usr/local/ gradle: - fdroid - - rustCrypto srclibs: - jitsi-meet@android-sdk-8.1.1 prebuild: @@ -2215,7 +2212,6 @@ Builds: - tar xzf node.tar.gz --strip-components=1 -C /usr/local/ gradle: - fdroid - - rustCrypto srclibs: - jitsi-meet@android-sdk-8.1.1 prebuild: diff --git a/metadata/eu.hydrologis.smash.yml b/metadata/eu.hydrologis.smash.yml index 8da98b1f20..23801f646e 100644 --- a/metadata/eu.hydrologis.smash.yml +++ b/metadata/eu.hydrologis.smash.yml @@ -70,6 +70,7 @@ Builds: - versionName: 1.8.0 versionCode: 69 + disable: https://github.com/geopaparazzi/smash/issues/251 commit: 092694f4f517c0991277cf3dfba127d113edc27b submodules: true sudo: diff --git a/metadata/fr.nocle.passegares.yml b/metadata/fr.nocle.passegares.yml index 63694973b6..7c4f2fc0b3 100644 --- a/metadata/fr.nocle.passegares.yml +++ b/metadata/fr.nocle.passegares.yml @@ -272,6 +272,10 @@ Builds: versionCode: 208 commit: 671a39b0e284b71b81c51a51b6da905ad5bd41e5 subdir: app + sudo: + - apt-get update + - apt-get install openjdk-17-jdk-headless + - update-alternatives --auto java gradle: - yes diff --git a/metadata/org.handmadeideas.floccus.yml b/metadata/org.handmadeideas.floccus.yml index e8c4d6afa3..de01bc9a63 100644 --- a/metadata/org.handmadeideas.floccus.yml +++ b/metadata/org.handmadeideas.floccus.yml @@ -244,13 +244,12 @@ Builds: subdir: android/app sudo: - apt-get update - - apt-get install -y build-essential - - curl -Lo node.tar.xz https://nodejs.org/dist/v14.18.2/node-v14.18.2-linux-x64.tar.xz - - echo "dae683f911fe5af11f1dc9d7746d80fccdb1e7b4bef31a570f5daffadd897c42 node.tar.xz" + - apt-get install -y openjdk-17-jdk-headless + - update-java-alternatives -a + - curl -Lo node.tar.gz https://nodejs.org/dist/v21.4.0/node-v21.4.0-linux-x64.tar.gz + - echo "d8cd0ec0b78bcbc591e7a4655a92c1c667e64bc434e7a895904dc1fe9442af1d node.tar.gz" | sha256sum -c - - - tar xJf node.tar.xz - - cp -a node-v14.18.2-linux-x64/. /usr/local/ - - npm install -g npm@7 + - tar xzf node.tar.gz --strip-components=1 -C /usr/local/ gradle: - yes prebuild: