From 8de7180b5deb71ebd7a3016544c5fb64dd46e651 Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <hans@eds.org>
Date: Mon, 28 Apr 2025 15:00:18 +0200
Subject: [PATCH] gitlab-ci: change "fdroid build" to use env vars in
 config.yml

replaces !22116
---
 .gitlab-ci.yml | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ce89e6e9ba..65505621f3 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -368,12 +368,11 @@ fdroid build:
           fdroid"
 
     # use fdroidserver test keystore as placeholder since `fdroid publish` requires it
-    - printf 'repo_keyalias\x3a sova\n' > config.yml
-    - printf 'keystorepass\x3a r9aquRHYoI8+dYz6jKrLntQ5/NJNASFBacJh7Jv2BlI=\n' >> config.yml
-    - printf 'keypass\x3a r9aquRHYoI8+dYz6jKrLntQ5/NJNASFBacJh7Jv2BlI=\n' >> config.yml
-    - printf 'keydname\x3a "CN=Birdman, OU=Cell, O=Alcatraz, L=Alcatraz, S=California, C=US"\n' >> config.yml
-    - keystore=$fdroidserver/tests/keystore.jks
-    - printf "keystore\x3a $keystore\n" >> config.yml
+    - export keystorepass='r9aquRHYoI8+dYz6jKrLntQ5/NJNASFBacJh7Jv2BlI='
+    - export keypass='r9aquRHYoI8+dYz6jKrLntQ5/NJNASFBacJh7Jv2BlI='
+    - export keystore=$fdroidserver/tests/keystore.jks
+    - keytool -changealias -alias sova -destalias ciarang
+        -keystore $keystore -storepass:env keystorepass -keypass:env keypass
 
     - APPS="$(./tools/find-changed-builds.py)"
     - for build in $APPS; do