From b469e9c16290dc077b7661479414eabfbb36b0b0 Mon Sep 17 00:00:00 2001 From: linsui <2873532-linsui@users.noreply.gitlab.com> Date: Sun, 22 Sep 2024 17:46:00 +0800 Subject: [PATCH] misc fixes --- metadata/com.carriez.flutter_hbb.yml | 2 + .../com.coboltforge.dontmind.multivnc.yml | 5 +- metadata/com.jiaqifeng.hacki.yml | 63 ------------------- metadata/com.kaanelloed.iconeration.yml | 18 +----- metadata/com.mensinator.app.yml | 7 --- metadata/com.nathanatos.Cuppa.yml | 2 +- metadata/com.page.bizzle.yml | 1 + metadata/de.rainerhock.eightbitwonders.yml | 2 +- metadata/in.sunilpaulmathew.ashell.yml | 6 +- metadata/io.ente.auth.yml | 3 + metadata/io.github.petlyh.jsdict.yml | 3 +- metadata/us.materialio.app.yml | 43 ++----------- 12 files changed, 24 insertions(+), 131 deletions(-) diff --git a/metadata/com.carriez.flutter_hbb.yml b/metadata/com.carriez.flutter_hbb.yml index 4a49d75409..73375d08be 100644 --- a/metadata/com.carriez.flutter_hbb.yml +++ b/metadata/com.carriez.flutter_hbb.yml @@ -201,6 +201,7 @@ Builds: - versionName: 1.3.1 versionCode: 103010002 + disable: build failed commit: 1.3.1 timeout: 14400 sudo: @@ -215,6 +216,7 @@ Builds: - versionName: 1.3.1 versionCode: 103010003 + disable: build failed commit: 1.3.1 timeout: 14400 sudo: diff --git a/metadata/com.coboltforge.dontmind.multivnc.yml b/metadata/com.coboltforge.dontmind.multivnc.yml index 4675cc27e1..5e802be34c 100644 --- a/metadata/com.coboltforge.dontmind.multivnc.yml +++ b/metadata/com.coboltforge.dontmind.multivnc.yml @@ -558,14 +558,13 @@ Builds: versionCode: 98 commit: 0e2040e4dbefa218b97ce668eb165fbbae9db2ef subdir: android/app + submodules: true sudo: - apt-get update - - apt-get install -y automake build-essential libtool openjdk-17-jdk-headless + - apt-get install -y automake build-essential libtool gradle: - yes prebuild: - - git submodule sync - - git submodule update --init --recursive - sdkmanager 'cmake;3.10.2.4988404' - ../../prepareLibreSSL.sh scandelete: diff --git a/metadata/com.jiaqifeng.hacki.yml b/metadata/com.jiaqifeng.hacki.yml index bea40e2809..9b5d7705aa 100644 --- a/metadata/com.jiaqifeng.hacki.yml +++ b/metadata/com.jiaqifeng.hacki.yml @@ -3707,69 +3707,6 @@ Builds: - export PUB_CACHE=$(pwd)/.pub-cache - submodules/flutter/bin/flutter build apk --release --split-per-abi --target-platform="android-arm64" - - versionName: 2.9.2 - versionCode: 1501 - commit: c24670d5d8f674ebe9220db7e0227403c43b83d1 - submodules: true - output: build/app/outputs/apk/release/app-*.apk - rm: - - ios - - test - prebuild: - - export PUB_CACHE=$(pwd)/.pub-cache - - submodules/flutter/bin/flutter config --no-analytics - - submodules/flutter/bin/flutter pub get - scanignore: - - submodules/flutter/bin/cache - scandelete: - - .pub-cache - - submodules/flutter - build: - - export PUB_CACHE=$(pwd)/.pub-cache - - submodules/flutter/bin/flutter build apk --release --split-per-abi --target-platform="android-x64" - - - versionName: 2.9.2 - versionCode: 1502 - commit: c24670d5d8f674ebe9220db7e0227403c43b83d1 - submodules: true - output: build/app/outputs/apk/release/app-*.apk - rm: - - ios - - test - prebuild: - - export PUB_CACHE=$(pwd)/.pub-cache - - submodules/flutter/bin/flutter config --no-analytics - - submodules/flutter/bin/flutter pub get - scanignore: - - submodules/flutter/bin/cache - scandelete: - - .pub-cache - - submodules/flutter - build: - - export PUB_CACHE=$(pwd)/.pub-cache - - submodules/flutter/bin/flutter build apk --release --split-per-abi --target-platform="android-arm" - - - versionName: 2.9.2 - versionCode: 1503 - commit: c24670d5d8f674ebe9220db7e0227403c43b83d1 - submodules: true - output: build/app/outputs/apk/release/app-*.apk - rm: - - ios - - test - prebuild: - - export PUB_CACHE=$(pwd)/.pub-cache - - submodules/flutter/bin/flutter config --no-analytics - - submodules/flutter/bin/flutter pub get - scanignore: - - submodules/flutter/bin/cache - scandelete: - - .pub-cache - - submodules/flutter - build: - - export PUB_CACHE=$(pwd)/.pub-cache - - submodules/flutter/bin/flutter build apk --release --split-per-abi --target-platform="android-arm64" - - versionName: 2.9.3 versionCode: 1511 commit: 3413b1686d596e3e38d03cb58319fa591be697f1 diff --git a/metadata/com.kaanelloed.iconeration.yml b/metadata/com.kaanelloed.iconeration.yml index d6bc86d796..e1de72e055 100644 --- a/metadata/com.kaanelloed.iconeration.yml +++ b/metadata/com.kaanelloed.iconeration.yml @@ -126,25 +126,9 @@ Builds: gradle: - yes - - versionName: 2024.09.01 - versionCode: 35 - disable: https://codeberg.org/kaanelloed/Iconeration/issues/36#issuecomment-2315503 - commit: ce7a4e50b04396ce7b6f4a270f869192c647143f - subdir: app - submodules: true - gradle: - - yes - - - versionName: 2024.09.02 - versionCode: 36 - commit: 44d11cd8db768bfed0ec018d347810dac676cf1e - subdir: app - submodules: true - gradle: - - yes - - versionName: 2024.09.03 versionCode: 37 + disable: https://codeberg.org/kaanelloed/Iconeration/issues/36#issuecomment-2315503 commit: 99f74406067ed330b119324f2115a8a467099f8f subdir: app submodules: true diff --git a/metadata/com.mensinator.app.yml b/metadata/com.mensinator.app.yml index 420e009cd3..2ba28168fe 100644 --- a/metadata/com.mensinator.app.yml +++ b/metadata/com.mensinator.app.yml @@ -18,13 +18,6 @@ Builds: gradle: - yes - - versionName: '1.9' - versionCode: 19 - commit: 7a1cb05955c8f4cbd1ce7b0e2baba9efd3bddba8 - subdir: app - gradle: - - yes - - versionName: 1.9.1 versionCode: 20 commit: e1edd20e8096b81413673431b9aaf9212fdfac9d diff --git a/metadata/com.nathanatos.Cuppa.yml b/metadata/com.nathanatos.Cuppa.yml index f561325f43..cb429f4cae 100644 --- a/metadata/com.nathanatos.Cuppa.yml +++ b/metadata/com.nathanatos.Cuppa.yml @@ -396,7 +396,7 @@ Builds: commit: af160f1703c1caa8dcf5647c72a8e1f966af39a2 output: build/app/outputs/apk/release/app-release-unsigned.apk srclibs: - - flutter@3.24.0 + - flutter@3.24.3 rm: - ios prebuild: diff --git a/metadata/com.page.bizzle.yml b/metadata/com.page.bizzle.yml index b1fb6a5ec8..0a7af355b1 100644 --- a/metadata/com.page.bizzle.yml +++ b/metadata/com.page.bizzle.yml @@ -17,6 +17,7 @@ Builds: subdir: app gradle: - yes + prebuild: sed -i -e '/gms/d' ../build.gradle AutoUpdateMode: Version UpdateCheckMode: Tags diff --git a/metadata/de.rainerhock.eightbitwonders.yml b/metadata/de.rainerhock.eightbitwonders.yml index 35f990205a..f059abab1c 100644 --- a/metadata/de.rainerhock.eightbitwonders.yml +++ b/metadata/de.rainerhock.eightbitwonders.yml @@ -80,7 +80,7 @@ Builds: - versionName: 0.8.4 versionCode: 100030 - commit: 98897e994bbfdef1b95e31975efe68050ad85fcc + commit: cc5a86676cbd679ad72fa91670397ada8a4376d7 subdir: app submodules: true sudo: diff --git a/metadata/in.sunilpaulmathew.ashell.yml b/metadata/in.sunilpaulmathew.ashell.yml index d20322469b..b3583bb411 100644 --- a/metadata/in.sunilpaulmathew.ashell.yml +++ b/metadata/in.sunilpaulmathew.ashell.yml @@ -17,7 +17,6 @@ AutoName: aShell RepoType: git Repo: https://gitlab.com/sunilpaulmathew/ashell.git -Binaries: https://fdroid-release-redirector.herokuapp.com/gitlab/sunilpaulmathew/ashell/%v/app-release.apk Builds: - versionName: v0.6 @@ -25,6 +24,7 @@ Builds: commit: v0.6 subdir: app output: build/outputs/apk/release/*.apk + binary: https://gitlab.com/-/project/41295637/uploads/136cc7b1da6b68e59954732445bbc2d2/app-release.apk srclibs: - reproducible-apk-tools@c08142d2cd256e7c0f3b7eebf1fad21ee307f9c3 prebuild: gradle clean @@ -38,6 +38,7 @@ Builds: commit: 31e681a2c3f53f2eb3c8492149db54dd9e67f975 subdir: app output: build/outputs/apk/release/*.apk + binary: https://gitlab.com/-/project/41295637/uploads/3a7e5df225aad4450bc37f36b4fdf81e/app-release.apk srclibs: - reproducible-apk-tools@c08142d2cd256e7c0f3b7eebf1fad21ee307f9c3 prebuild: gradle clean @@ -51,6 +52,7 @@ Builds: commit: 9981e33a037974ee39b1e4bd14defa2fb6e1d3c5 subdir: app output: build/outputs/apk/release/*.apk + binary: https://gitlab.com/-/project/41295637/uploads/3e46fc1b0dd24514b85d9e8effd11478/app-release.apk srclibs: - reproducible-apk-tools@c08142d2cd256e7c0f3b7eebf1fad21ee307f9c3 prebuild: gradle clean @@ -68,6 +70,7 @@ Builds: - apt-get install -y openjdk-17-jdk-headless - update-java-alternatives -a output: build/outputs/apk/release/*.apk + binary: https://gitlab.com/-/project/41295637/uploads/4ad976d21f99ed6e9bc59c733a9cd95f/app-release.apk srclibs: - reproducible-apk-tools@c08142d2cd256e7c0f3b7eebf1fad21ee307f9c3 prebuild: gradle clean @@ -81,6 +84,7 @@ Builds: commit: 2049c9ed7f76bf8be2e8742550c03bdf18968fe7 subdir: app output: build/outputs/apk/release/*.apk + binary: https://gitlab.com/-/project/41295637/uploads/9224c87f19fc8be22ad8b1238b5be93a/app-release.apk srclibs: - reproducible-apk-tools@c08142d2cd256e7c0f3b7eebf1fad21ee307f9c3 prebuild: gradle clean diff --git a/metadata/io.ente.auth.yml b/metadata/io.ente.auth.yml index c615309fe3..2b47c7a95e 100644 --- a/metadata/io.ente.auth.yml +++ b/metadata/io.ente.auth.yml @@ -1797,6 +1797,8 @@ Builds: - auth/windows - cli - desktop + - docs + - infra - mobile - server - web @@ -1809,6 +1811,7 @@ Builds: scandelete: - auth/flutter - auth/.pub-cache + - auth/assets/simple-icons build: - export PUB_CACHE=$(pwd)/.pub-cache - pushd $$libsodium$$ diff --git a/metadata/io.github.petlyh.jsdict.yml b/metadata/io.github.petlyh.jsdict.yml index 8cd4901e5d..62419be846 100644 --- a/metadata/io.github.petlyh.jsdict.yml +++ b/metadata/io.github.petlyh.jsdict.yml @@ -161,7 +161,8 @@ Builds: - versionName: 1.2.2 versionCode: 9 - commit: 890587b32cb0aacf9230bd5b053ee476c454b60b + disable: https://github.com/petlyh/JS-Dict/issues/14 + commit: 9e77651938a1259dfdf9f4703c093444afe78273 submodules: true output: build/app/outputs/flutter-apk/app-release.apk prebuild: diff --git a/metadata/us.materialio.app.yml b/metadata/us.materialio.app.yml index ccf41cee83..3d6b9754e1 100644 --- a/metadata/us.materialio.app.yml +++ b/metadata/us.materialio.app.yml @@ -62,17 +62,16 @@ Builds: - popd - mv $$esbuild$$/esbuild ../../node_modules/@esbuild/linux-x64/bin/esbuild - - versionName: 1.5.4 - versionCode: 45 - commit: f7199fed8d6effc00e8e5eff161297ed3a5b9bc1 + - versionName: 1.5.7 + versionCode: 48 + disable: libnode.so + commit: d88625b03f2528b4483d2354a8d48e790cd86915 subdir: materialious/android/app sudo: - apt-get update - apt-get install -y npm golang-go make gradle: - yes - srclibs: - - esbuild@v0.19.12 prebuild: - sed -i -e '/gms/d' ../build.gradle - cd ../.. @@ -81,38 +80,8 @@ Builds: - npx cap sync scandelete: - materialious/node_modules - build: - - pushd $$esbuild$$ - - make esbuild - - popd - - mv $$esbuild$$/esbuild ../../node_modules/@esbuild/linux-x64/bin/esbuild - - - versionName: 1.5.5 - versionCode: 46 - commit: 8284d73fa98085d36aedf5fcf49c0dcd7f46c4a1 - subdir: materialious/android/app - sudo: - - apt-get update - - apt-get install -y npm golang-go make - gradle: - - yes - srclibs: - - esbuild@v0.19.12 - prebuild: - - sed -i -e '/gms/d' ../build.gradle - - cd ../.. - - npm install - - npm run build - - npx cap sync - scandelete: - - materialious/node_modules - build: - - pushd $$esbuild$$ - - make esbuild - - popd - - mv $$esbuild$$/esbuild ../../node_modules/@esbuild/linux-x64/bin/esbuild AutoUpdateMode: Version UpdateCheckMode: Tags -CurrentVersion: 1.5.5 -CurrentVersionCode: 46 +CurrentVersion: 1.5.7 +CurrentVersionCode: 48