diff --git a/.drone.yml b/.drone.yml index 8b392b5a..e9267b93 100644 --- a/.drone.yml +++ b/.drone.yml @@ -75,8 +75,8 @@ steps: from_secret: STANDALONE_KEYSTORE_PASS FDROID_KEYSTORE_PASS: from_secret: FDROID_KEYSTORE_PASS - GOOGLE_KEYSTORE_CONF: - from_secret: GOOGLE_KEYSTORE_CONF + GOOGLE_KEYSTORE_PASS: + from_secret: GOOGLE_KEYSTORE_PASS # - name: Sign Android Release Artifact (.APK) for Standalone Use # commands: diff --git a/android/key.properties b/android/key.properties new file mode 100644 index 00000000..e2385da2 --- /dev/null +++ b/android/key.properties @@ -0,0 +1,4 @@ +storePassword=changeme +keyPassword=changeme +keyAlias=google +storeFile=/tmp/src/test-store diff --git a/ci.py b/ci.py index e4630db7..2d07d9b5 100755 --- a/ci.py +++ b/ci.py @@ -27,7 +27,7 @@ def podman_offline(dir, *args): "-v", f"{HOST_HOME}/google-keystore:{CONTAINER_HOME}/google-keystore", "--env", "FDROID_KEYSTORE_PASS=" + os.environ.get('FDROID_KEYSTORE_PASS'), "--env", "STANDALONE_KEYSTORE_PASS=" + os.environ.get('STANDALONE_KEYSTORE_PASS'), - "--env", "GOOGLE_KEYSTORE_CONF=" + os.environ.get('GOOGLE_KEYSTORE_CONF'), + "--env", "GOOGLE_KEYSTORE_PASS=" + os.environ.get('GOOGLE_KEYSTORE_PASS'), "--user", os.getuid().__str__() + ":" + os.getgid().__str__(), "--userns=keep-id", CONTAINER_IMAGE, "bash", "-c", ' '.join(args) ], check=True) @@ -52,7 +52,7 @@ def build_apk(): "&& flutter build apk --flavor production") def build_bundle(): podman_offline(f"{CONTAINER_HOME}/src", "chown -R $(id -u):$(id -g) /tmp/gradle /tmp/flutter_pub_cache", - "&& echo $GOOGLE_KEYSTORE_CONF > android/key.properties", + "&& sed -i s/changeme/$GOOGLE_KEYSTORE_PASS/ android/key.properties", "&& flutter pub get --offline", "&& flutter build appbundle --flavor production")