From 9d6019bec113a62e7267e938d2e38feec24b8f61 Mon Sep 17 00:00:00 2001 From: proletarius101 Date: Thu, 14 Jul 2022 20:51:52 +0800 Subject: [PATCH 1/6] switch to the official sdkmanager --- .gitlab-ci.yml | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d4d1214eaef..6b626b9ce55 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -23,6 +23,18 @@ variables: - export PYTHONPATH="$fdroidserver:$fdroidserver/examples" - export PYTHONUNBUFFERED=true +.install_sdkmanager: &install_sdkmanager + - wget -O /tmp/cmdline-tools.zip -t 5 "https://dl.google.com/android/repository/commandlinetools-linux-8512546_latest.zip" + - echo "2ccbda4302db862a28ada25aa7425d99dce9462046003c1714b059b5c47970d8 /tmp/cmdline-tools.zip" | + sha256sum -c - + - unzip -q -o /tmp/cmdline-tools.zip -d /tmp/cmdline-tools + - rm /tmp/cmdline-tools.zip + - mkdir -p ${ANDROID_SDK_ROOT}/cmdline-tools/tools + - mv /tmp/cmdline-tools/cmdline-tools/* ${ANDROID_SDK_ROOT}/cmdline-tools/tools + || true + - export PATH=${ANDROID_SDK_ROOT}/cmdline-tools/tools/bin:${PATH} + - yes | sdkmanager --licenses + .get_target_source_refs: &get_target_source_refs - | if [ "$CI_PROJECT_PATH" = "fdroid/fdroiddata" ] && [ "$CI_COMMIT_BRANCH" = "$CI_DEFAULT_BRANCH" ]; then @@ -259,11 +271,8 @@ fdroid build: - test -n "$fdroidserver" || source /etc/profile.d/bsenv.sh - # TODO remove sdkmanager install once it is included in the buildserver image - - git clone --depth=1 --branch=0.5.2 https://gitlab.com/fdroid/sdkmanager.git - - git -C sdkmanager checkout -B master 59374827baed7020c9761d9c8f51dcf9b490ba28 - - pip3 install -e sdkmanager - - rm -rf $ANDROID_HOME/tools # TODO remove once sdkmanager can upgrade installed packages + - *install_sdkmanager + - sdkmanager "tools" "platform-tools" "build-tools;31.0.0" - *install_fdroid_server -- GitLab From dfe2314a63e49c926e60cea965822bddceec7ea5 Mon Sep 17 00:00:00 2001 From: proletarius101 Date: Thu, 14 Jul 2022 21:13:55 +0800 Subject: [PATCH 2/6] test --- metadata/de.kaffeemitkoffein.imagepipe.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/metadata/de.kaffeemitkoffein.imagepipe.yml b/metadata/de.kaffeemitkoffein.imagepipe.yml index e737cf26ac0..c971ed4787d 100644 --- a/metadata/de.kaffeemitkoffein.imagepipe.yml +++ b/metadata/de.kaffeemitkoffein.imagepipe.yml @@ -135,6 +135,7 @@ Builds: commit: 4b37e03e9c13c1cfff1669e773206f05b41b1663 gradle: - yes + build: echo "test" output: app/build/outputs/apk/release/app-release-unsigned.apk AutoUpdateMode: Version v%v -- GitLab From 5d5725a1316820ac6f89499174d8a6d6ad39146b Mon Sep 17 00:00:00 2001 From: proletarius101 Date: Thu, 14 Jul 2022 21:34:28 +0800 Subject: [PATCH 3/6] fix wget not found --- .gitlab-ci.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6b626b9ce55..c7fde3555d6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -24,11 +24,10 @@ variables: - export PYTHONUNBUFFERED=true .install_sdkmanager: &install_sdkmanager - - wget -O /tmp/cmdline-tools.zip -t 5 "https://dl.google.com/android/repository/commandlinetools-linux-8512546_latest.zip" + - curl -Lo /tmp/cmdline-tools.zip -t 5 "https://dl.google.com/android/repository/commandlinetools-linux-8512546_latest.zip" - echo "2ccbda4302db862a28ada25aa7425d99dce9462046003c1714b059b5c47970d8 /tmp/cmdline-tools.zip" | sha256sum -c - - unzip -q -o /tmp/cmdline-tools.zip -d /tmp/cmdline-tools - - rm /tmp/cmdline-tools.zip - mkdir -p ${ANDROID_SDK_ROOT}/cmdline-tools/tools - mv /tmp/cmdline-tools/cmdline-tools/* ${ANDROID_SDK_ROOT}/cmdline-tools/tools || true -- GitLab From b3bb0f46cb312acea623b1390c60225c3c5a0895 Mon Sep 17 00:00:00 2001 From: proletarius101 Date: Thu, 14 Jul 2022 21:35:07 +0800 Subject: [PATCH 4/6] fix test --- metadata/de.kaffeemitkoffein.imagepipe.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/metadata/de.kaffeemitkoffein.imagepipe.yml b/metadata/de.kaffeemitkoffein.imagepipe.yml index c971ed4787d..e737cf26ac0 100644 --- a/metadata/de.kaffeemitkoffein.imagepipe.yml +++ b/metadata/de.kaffeemitkoffein.imagepipe.yml @@ -135,7 +135,6 @@ Builds: commit: 4b37e03e9c13c1cfff1669e773206f05b41b1663 gradle: - yes - build: echo "test" output: app/build/outputs/apk/release/app-release-unsigned.apk AutoUpdateMode: Version v%v -- GitLab From cad599caabbe7b3df5bb7a9f82ddb21ecdb74c64 Mon Sep 17 00:00:00 2001 From: proletarius101 Date: Thu, 14 Jul 2022 21:44:29 +0800 Subject: [PATCH 5/6] fix --- metadata/de.kaffeemitkoffein.imagepipe.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/metadata/de.kaffeemitkoffein.imagepipe.yml b/metadata/de.kaffeemitkoffein.imagepipe.yml index e737cf26ac0..c971ed4787d 100644 --- a/metadata/de.kaffeemitkoffein.imagepipe.yml +++ b/metadata/de.kaffeemitkoffein.imagepipe.yml @@ -135,6 +135,7 @@ Builds: commit: 4b37e03e9c13c1cfff1669e773206f05b41b1663 gradle: - yes + build: echo "test" output: app/build/outputs/apk/release/app-release-unsigned.apk AutoUpdateMode: Version v%v -- GitLab From 90087bfee4bb476ca58275026ef3dc0fae4fb1d5 Mon Sep 17 00:00:00 2001 From: proletarius101 Date: Thu, 14 Jul 2022 21:59:24 +0800 Subject: [PATCH 6/6] test --- metadata/de.kaffeemitkoffein.imagepipe.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/metadata/de.kaffeemitkoffein.imagepipe.yml b/metadata/de.kaffeemitkoffein.imagepipe.yml index c971ed4787d..e737cf26ac0 100644 --- a/metadata/de.kaffeemitkoffein.imagepipe.yml +++ b/metadata/de.kaffeemitkoffein.imagepipe.yml @@ -135,7 +135,6 @@ Builds: commit: 4b37e03e9c13c1cfff1669e773206f05b41b1663 gradle: - yes - build: echo "test" output: app/build/outputs/apk/release/app-release-unsigned.apk AutoUpdateMode: Version v%v -- GitLab