From d7c3847119e1f13977f584fb21d66e3d3b4dcbd7 Mon Sep 17 00:00:00 2001 From: linsui Date: Sun, 24 Mar 2024 20:10:00 +0800 Subject: [PATCH] misc fixes --- metadata/app.simple.peri.yml | 2 +- metadata/chat.simplex.app.yml | 4 +- metadata/com.android.geto.yml | 2 +- metadata/com.github.lamarios.clipious.yml | 15 ++++ metadata/io.github.sspanak.tt9.yml | 1 + metadata/it.fast4x.rimusic.yml | 13 --- metadata/org.veilproject.wallet.yml | 102 ---------------------- 7 files changed, 20 insertions(+), 119 deletions(-) diff --git a/metadata/app.simple.peri.yml b/metadata/app.simple.peri.yml index ce19a1b30b..b9f2ad016d 100644 --- a/metadata/app.simple.peri.yml +++ b/metadata/app.simple.peri.yml @@ -167,7 +167,7 @@ Builds: - versionName: 1.37_beta versionCode: 137 - commit: 6130420885447a25137a462c28a46a41f82c691c + commit: a0d80dbbf4b1a1c47ca7f75292e2d90c9575ec4b subdir: app gradle: - prod diff --git a/metadata/chat.simplex.app.yml b/metadata/chat.simplex.app.yml index 5bbaaf9928..f0902e49fd 100644 --- a/metadata/chat.simplex.app.yml +++ b/metadata/chat.simplex.app.yml @@ -1073,7 +1073,7 @@ Builds: timeout: 30000 sudo: - apt-get update - - apt-get install -y xz-utils zipalign + - apt-get install -y xz-utils zipalign zip - mkdir -m 0755 /nix - chown vagrant /nix - chown -R vagrant /tmp @@ -1097,7 +1097,7 @@ Builds: timeout: 60000 sudo: - apt-get update - - apt-get install -y xz-utils zipalign + - apt-get install -y xz-utils zipalign zip - mkdir -m 0755 /nix - chown vagrant /nix - chown -R vagrant /tmp diff --git a/metadata/com.android.geto.yml b/metadata/com.android.geto.yml index 40c1d17054..5a9ba4d5fb 100644 --- a/metadata/com.android.geto.yml +++ b/metadata/com.android.geto.yml @@ -179,7 +179,7 @@ Builds: commit: 797f4b46816d4bc0814b5846ddfc441c7271a80a subdir: app gradle: - - yes + - prod scandelete: - build-logic/convention/build diff --git a/metadata/com.github.lamarios.clipious.yml b/metadata/com.github.lamarios.clipious.yml index 58658b9663..7b463f086e 100644 --- a/metadata/com.github.lamarios.clipious.yml +++ b/metadata/com.github.lamarios.clipious.yml @@ -347,6 +347,11 @@ Builds: versionCode: 40471 commit: c698bb3f9d1b0ec01c9ffb55a53ffe95175c37a1 submodules: true + sudo: + - echo "deb https://deb.debian.org/debian bullseye main" > /etc/apt/sources.list.d/bullseye.list + - apt-get update + - apt-get install -y -t bullseye openjdk-11-jdk-headless + - update-java-alternatives --set java-1.11.0-openjdk-amd64 output: build/app/outputs/flutter-apk/app-x86_64-release.apk binary: https://github.com/lamarios/clipious/releases/download/%v/app-x86_64-release.apk rm: @@ -383,6 +388,11 @@ Builds: versionCode: 40472 commit: c698bb3f9d1b0ec01c9ffb55a53ffe95175c37a1 submodules: true + sudo: + - echo "deb https://deb.debian.org/debian bullseye main" > /etc/apt/sources.list.d/bullseye.list + - apt-get update + - apt-get install -y -t bullseye openjdk-11-jdk-headless + - update-java-alternatives --set java-1.11.0-openjdk-amd64 output: build/app/outputs/flutter-apk/app-armeabi-v7a-release.apk binary: https://github.com/lamarios/clipious/releases/download/%v/app-armeabi-v7a-release.apk rm: @@ -419,6 +429,11 @@ Builds: versionCode: 40473 commit: c698bb3f9d1b0ec01c9ffb55a53ffe95175c37a1 submodules: true + sudo: + - echo "deb https://deb.debian.org/debian bullseye main" > /etc/apt/sources.list.d/bullseye.list + - apt-get update + - apt-get install -y -t bullseye openjdk-11-jdk-headless + - update-java-alternatives --set java-1.11.0-openjdk-amd64 output: build/app/outputs/flutter-apk/app-arm64-v8a-release.apk binary: https://github.com/lamarios/clipious/releases/download/%v/app-arm64-v8a-release.apk rm: diff --git a/metadata/io.github.sspanak.tt9.yml b/metadata/io.github.sspanak.tt9.yml index fbf419162b..ae8e5267e9 100644 --- a/metadata/io.github.sspanak.tt9.yml +++ b/metadata/io.github.sspanak.tt9.yml @@ -26,6 +26,7 @@ Builds: - versionName: '29.0' versionCode: 411 + disable: https://github.com/sspanak/tt9/issues/476 commit: 1665b3d96ce86ac3a0c81511eaacac3a14149623 subdir: app gradle: diff --git a/metadata/it.fast4x.rimusic.yml b/metadata/it.fast4x.rimusic.yml index ce01453492..aa0b2b53d7 100644 --- a/metadata/it.fast4x.rimusic.yml +++ b/metadata/it.fast4x.rimusic.yml @@ -184,19 +184,6 @@ Builds: postbuild: $$reproducible-apk-tools$$/inplace-fix.py --zipalign fix-newlines $$OUT$$ 'META-INF/services/*' - - versionName: 0.6.26.1 - versionCode: 23 - commit: b04de77ff9e62ee2054489dc857ce1e19d325358 - subdir: app - gradle: - - yes - srclibs: - - reproducible-apk-tools@v0.2.3 - prebuild: sed -i -e '/android {/a lintOptions {isCheckReleaseBuilds = false}' - build.gradle.kts - postbuild: $$reproducible-apk-tools$$/inplace-fix.py --zipalign fix-newlines $$OUT$$ - 'META-INF/services/*' - - versionName: 0.6.27 versionCode: 24 commit: 14a59e6215d190980f42da17c7277211718a7aea diff --git a/metadata/org.veilproject.wallet.yml b/metadata/org.veilproject.wallet.yml index 0aea87736c..49848cc5e6 100644 --- a/metadata/org.veilproject.wallet.yml +++ b/metadata/org.veilproject.wallet.yml @@ -15,108 +15,6 @@ RepoType: git Repo: https://github.com/steel97/veil_wallet Builds: - - versionName: 1.0.19 - versionCode: 251 - commit: 2be43183e5e6b8ff1f3e8e0a6bc6c0783d8be82c - submodules: true - sudo: - - apt-get update - - apt-get install gcc libc-dev - output: build/app/outputs/flutter-apk/app-armeabi-v7a-release.apk - binary: https://github.com/steel97/veil_wallet/releases/download/v%v/veil-wallet.android-armeabi-v7a.apk - srclibs: - - rustup@1.27.0 - rm: - - ios - - linux - - macos - - web - - windows - prebuild: - - export PUB_CACHE=$(pwd)/.pub-cache - - submodules/flutter/bin/flutter config --no-analytics - - submodules/flutter/bin/flutter packages pub get - scanignore: - - submodules/flutter/bin/cache - scandelete: - - submodules/flutter - - .pub-cache - build: - - export PUB_CACHE=$(pwd)/.pub-cache - - $$rustup$$/rustup-init.sh -y --default-toolchain 1.76.0 --target armv7-linux-androideabi - - source $HOME/.cargo/env - - submodules/flutter/bin/flutter build apk --release --no-tree-shake-icons --split-per-abi - --target-platform="android-arm" --build-number=$$VERCODE$$ - ndk: 23.1.7779620 - - - versionName: 1.0.19 - versionCode: 252 - commit: 2be43183e5e6b8ff1f3e8e0a6bc6c0783d8be82c - submodules: true - sudo: - - apt-get update - - apt-get install gcc libc-dev - output: build/app/outputs/flutter-apk/app-arm64-v8a-release.apk - binary: https://github.com/steel97/veil_wallet/releases/download/v%v/veil-wallet.android-arm64-v8a.apk - srclibs: - - rustup@1.27.0 - rm: - - ios - - linux - - macos - - web - - windows - prebuild: - - export PUB_CACHE=$(pwd)/.pub-cache - - submodules/flutter/bin/flutter config --no-analytics - - submodules/flutter/bin/flutter packages pub get - scanignore: - - submodules/flutter/bin/cache - scandelete: - - submodules/flutter - - .pub-cache - build: - - export PUB_CACHE=$(pwd)/.pub-cache - - $$rustup$$/rustup-init.sh -y --default-toolchain 1.76.0 --target aarch64-linux-android - - source $HOME/.cargo/env - - submodules/flutter/bin/flutter build apk --release --no-tree-shake-icons --split-per-abi - --target-platform="android-arm64" --build-number=$$VERCODE$$ - ndk: 23.1.7779620 - - - versionName: 1.0.19 - versionCode: 253 - commit: 2be43183e5e6b8ff1f3e8e0a6bc6c0783d8be82c - submodules: true - sudo: - - apt-get update - - apt-get install gcc libc-dev - output: build/app/outputs/flutter-apk/app-x86_64-release.apk - binary: https://github.com/steel97/veil_wallet/releases/download/v%v/veil-wallet.android-x86_64.apk - srclibs: - - rustup@1.27.0 - rm: - - ios - - linux - - macos - - web - - windows - prebuild: - - export PUB_CACHE=$(pwd)/.pub-cache - - submodules/flutter/bin/flutter config --no-analytics - - submodules/flutter/bin/flutter packages pub get - scanignore: - - submodules/flutter/bin/cache - scandelete: - - submodules/flutter - - .pub-cache - build: - - export PUB_CACHE=$(pwd)/.pub-cache - - $$rustup$$/rustup-init.sh -y --default-toolchain 1.76.0 --target x86_64-linux-android - - source $HOME/.cargo/env - - submodules/flutter/bin/flutter build apk --release --no-tree-shake-icons --split-per-abi - --target-platform="android-x64" --build-number=$$VERCODE$$ - ndk: 23.1.7779620 - - versionName: 1.0.20 versionCode: 261 commit: c0110323fc4650a1cd31167815090c99bc2811ef