Merge branch 'main' into feat/room-sqlcipher

2023-11-29 21:50:33 +01:00 · 2023-11-29 21:50:33 +01:00 · ada0171f71
commit ada0171f71
parent 984290f79d 14fe38324a
2 changed files with 4 additions and 2 deletions
--- a/.drone.yml
+++ b/.drone.yml
@ -117,7 +117,7 @@ steps:
      # Encrypt keystore & set $RELEASE_KEYSTORE_BASE64 environment variable in Drone CI
      # - openssl base64 -A -in keystore.jks
      # Decrypt keystore
-      - echo $RELEASE_KEYSTORE_BASE64 | base64 -d > keystore.jks
+      - echo $RELEASE_KEYSTORE_BASE64 | base64 -d > /drone/src/SWADroid/keystore.jks
      # Assemble APK
      - ./gradlew assembleRelease

@ -127,7 +127,7 @@ steps:
      api_key:
        from_secret: gitea_api_key
      base_url: https://git.cuernodehipnos.es
-      files: SWADroid/SWADroid/build/outputs/apk/release/SWADroid-release.apk
+      files: /drone/src/SWADroid/SWADroid/build/outputs/apk/release/SWADroid-release.apk

  - name: rebuild-cache
    image: drillster/drone-volume-cache
--- a/SWADroid/build.gradle
+++ b/SWADroid/build.gradle
@ -88,6 +88,8 @@ android {
                signingConfig signingConfigs.release
            }
        }
+    } else {
+        project.logger.warn("RELEASE_STORE_FILE is not defined. Skipping signing step")
    }

    sourceSets {