From b867855398fc2ba5ffdb896f4086c4c44be2f7b2 Mon Sep 17 00:00:00 2001 From: Marcel Hibbe Date: Fri, 20 Nov 2026 12:59:21 +0100 Subject: [PATCH 1/4] chore(fastlane): remove release secrets from the environment The keystore passwords, the GitHub API token and the Huawei AppGallery Connect API client are no longer read from environment variables set in the shell configuration. The release lanes of the shared common.Fastfile from nextcloud/android-config ask for them instead, so the signing properties only name the keystore files and key aliases. Needs the common.Fastfile of nextcloud/android-config that asks for the secrets; merge after its sync pull request. Assisted-by: Claude Code:claude-opus-5-5 Signed-off-by: Marcel Hibbe --- fastlane/Fastfile | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/fastlane/Fastfile b/fastlane/Fastfile index f26cc9179323..3450cfaac653 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -5,17 +5,13 @@ ## config # add following to your shell rc: # export FASTLANE_NEXTCLOUD_UPLOAD_STORE_FILE="" -# export FASTLANE_NEXTCLOUD_UPLOAD_STORE_PASSWORD="" # export FASTLANE_NEXTCLOUD_UPLOAD_KEY_ALIAS="" -# export FASTLANE_NEXTCLOUD_UPLOAD_KEY_PASSWORD="" # export FASTLANE_NEXTCLOUD_STORE_FILE="" -# export FASTLANE_NEXTCLOUD_STORE_PASSWORD="" # export FASTLANE_NEXTCLOUD_KEY_ALIAS="" -# export FASTLANE_NEXTCLOUD_KEY_PASSWORD="" -# export FASTLANE_NEXTCLOUD_GITHUB_API_TOKEN="" -# export FASTLANE_NEXTCLOUD_HUAWEI_CLIENT_ID="" -# export FASTLANE_NEXTCLOUD_HUAWEI_CLIENT_SECRET="" -# export FASTLANE_NEXTCLOUD_HUAWEI_APP_ID="" +# +# Passwords, the GitHub API token and the Huawei AppGallery Connect API +# client are not read from the environment, they are asked for when a +# release lane starts (see common.Fastfile). skip_docs @@ -23,18 +19,15 @@ skip_docs APP="files" REPO="nextcloud/android" +# passwords are added at build time, see askForSigningPasswords in common.Fastfile GRADLE_SIGNING_PROPERTIES = { "android.injected.signing.store.file" => ENV["FASTLANE_NEXTCLOUD_UPLOAD_STORE_FILE"], - "android.injected.signing.store.password" => ENV["FASTLANE_NEXTCLOUD_UPLOAD_STORE_PASSWORD"], "android.injected.signing.key.alias" => ENV["FASTLANE_NEXTCLOUD_UPLOAD_KEY_ALIAS"], - "android.injected.signing.key.password" => ENV["FASTLANE_NEXTCLOUD_UPLOAD_KEY_PASSWORD"], }.freeze APK_SIGNING_PROPERTIES = { "android.injected.signing.store.file" => ENV["FASTLANE_NEXTCLOUD_STORE_FILE"], - "android.injected.signing.store.password" => ENV["FASTLANE_NEXTCLOUD_STORE_PASSWORD"], "android.injected.signing.key.alias" => ENV["FASTLANE_NEXTCLOUD_KEY_ALIAS"], - "android.injected.signing.key.password" => ENV["FASTLANE_NEXTCLOUD_KEY_PASSWORD"], }.freeze import("./common.Fastfile") From 415ebae0fd0d939651a4e3ea8030bcf76b9ef6f0 Mon Sep 17 00:00:00 2001 From: Marcel Hibbe Date: Fri, 20 Nov 2026 12:59:21 +0100 Subject: [PATCH 2/4] chore(fastlane): remove unused and duplicate release lanes createGithubRelease_RC and createGithubRelease_Final are not called anymore, common.Fastfile creates the GitHub release. checkChangelog is replaced by checkChangelogFile of common.Fastfile, which releasePhase2 runs for every app. Assisted-by: Claude Code:claude-opus-5-5 Signed-off-by: Marcel Hibbe --- fastlane/Fastfile | 30 ------------------------------ 1 file changed, 30 deletions(-) diff --git a/fastlane/Fastfile b/fastlane/Fastfile index 3450cfaac653..754d209c4f0d 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -48,37 +48,7 @@ platform :android do sh(" if [ $(find metadata/android/*/images -type f -not -name icon.png | grep -c . ) -gt 0 ] ; then echo 'Screenshots in fastlane folder exist; aborting!' ; exit 1 ; fi") end - private_lane :createGithubRelease_RC do |options| - set_github_release( - repository_name: REPO, - api_token: ENV["FASTLANE_NEXTCLOUD_GITHUB_API_TOKEN"], - name: options["versionName"], - tag_name: options["tag"], - is_prerelease: true, - description: (File.read("metadata/android/en-US/changelogs/" + options["versionCode"] + ".txt") rescue "No changelog provided"), - upload_assets: [ "release/gplay-release-" + options["versionCode"] + ".apk", "release/nextcloud-" + - options["versionCode"] + ".apk" ] - ) - end - - private_lane :createGithubRelease_Final do |options| - set_github_release( - repository_name: REPO, - api_token: ENV["FASTLANE_NEXTCLOUD_GITHUB_API_TOKEN"], - name: options["versionName"], - tag_name: options["tag"], - description: (File.read("metadata/android/en-US/changelogs/" + options["versionCode"] + ".txt") rescue "No changelog provided"), - upload_assets: Dir.glob("release/*.apk") - ) - end - - private_lane :checkChangelog do |options| - sh(" if [ ! -e metadata/android/en-US/changelogs/" + options["versionCode"].to_s + ".txt ] ; then echo 'Changelog fastlane/metadata/android/en-US/changelogs/" + options["versionCode"].to_s + ".txt does not exist' ; exit 1 ; fi") - sh(" if [ $(wc -m metadata/android/en-US/changelogs/" + options["versionCode"].to_s + ".txt | cut -d' ' -f1) -ge 500 ] ; then echo 'Changlog more than 500 chars' ; exit 1 ; fi") - end - private_lane :repoSpecificChecks do |options| - checkChangelog(getVersionInfo()) checkLibrary(isPrerelease: options[:isPrerelease]) checkIfScreenshotsExist() end From 12c95bc65f5ba8c3fbf854cc94020e9d17479371 Mon Sep 17 00:00:00 2001 From: Marcel Hibbe Date: Fri, 20 Nov 2026 13:02:10 +0100 Subject: [PATCH 3/4] chore(reuse): cover the fastlane release notes files incrementVersion creates the release notes as fastlane/metadata/android/en-US/changelogs/.txt without a license file. REUSE.toml covers these files now, like the release notes of the versionDev flavor. Assisted-by: Claude Code:claude-opus-5-5 Signed-off-by: Marcel Hibbe --- REUSE.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/REUSE.toml b/REUSE.toml index 1fda7dfdbb65..bd3adc3b8d3b 100644 --- a/REUSE.toml +++ b/REUSE.toml @@ -42,7 +42,7 @@ SPDX-FileCopyrightText = "2017-2025 Nextcloud GmbH Date: Fri, 20 Nov 2026 14:14:55 +0100 Subject: [PATCH 4/4] add HUAWEI_APP_ID Signed-off-by: Marcel Hibbe --- fastlane/Fastfile | 1 + 1 file changed, 1 insertion(+) diff --git a/fastlane/Fastfile b/fastlane/Fastfile index 754d209c4f0d..40edfdc8f3e5 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -18,6 +18,7 @@ skip_docs APP="files" REPO="nextcloud/android" +HUAWEI_APP_ID="102503897" # passwords are added at build time, see askForSigningPasswords in common.Fastfile GRADLE_SIGNING_PROPERTIES = {