Fix release signing

Jenkinsfile

@@ -44,6 +44,7 @@ pipeline {
           withCredentials([
             file(credentialsId: 'ANDROID_RELEASE_KEYSTORE', variable: 'ANDROID_RELEASE_KEYSTORE'),
             string(credentialsId: 'ANDROID_RELEASE_STOREPASS', variable: 'ANDROID_RELEASE_STOREPASS'),
+            string(credentialsId: 'ANDROID_RELEASE_KEYPASS', variable: 'ANDROID_RELEASE_KEYPASS'),
             string(credentialsId: 'MAPBOX_ACCESS_TOKEN', variable: 'MAPBOX_ACCESS_TOKEN'),
             string(credentialsId: 'SENTRY_DSN', variable: 'SENTRY_DSN'),
             string(credentialsId: 'SENTRY_AUTH_TOKEN', variable: 'SENTRY_AUTH_TOKEN'),

Makefile

@@ -1,5 +1,6 @@
 export PATH := $(PATH):./node_modules/.bin
-ANDROID_RELEASE_KEY_STOREPASS ?= NotSoSecret
+ANDROID_RELEASE_STOREPASS ?= NotSoSecret
+ANDROID_RELEASE_KEYPASS ?= NotSoSecret
 
 init: clear
 	# Install gomobile
@@ -71,7 +72,7 @@ new-keystore:
         -alias fieldnotes \
         -dname "CN=cadoles.com, OU=Dev, O=Cadoles, L=Dijon, S=Bourgogne-FrancheComté, C=FR" \
         -keystore "build/new.keystore" \
-		-storetype pkcs12 \
-        -storepass "$(ANDROID_RELEASE_STOREPASS)"
+        -storepass "$(ANDROID_RELEASE_STOREPASS)" \
+		-keypass "$(ANDROID_RELEASE_KEYPASS)"
 
 .PHONY: serve init clear

android/app/build.gradle

@@ -138,8 +138,8 @@ android {
             if (project.hasProperty('RELEASE_STORE_FILE')) {
                 storeFile file(RELEASE_STORE_FILE)
                 storePassword RELEASE_STORE_PASSWORD
-                keyAlias RELEASE_KEY_ALIAS
                 keyPassword RELEASE_KEY_PASSWORD
+                keyAlias RELEASE_KEY_ALIAS
             }
         }
     }

containers/ci/configure-gradle-keystore.sh

@@ -1,12 +1,14 @@
 #!/bin/bash
 
+set -xeo pipefail
+
 WORKSPACE_KEYSTORE=android/app/release.keystore
 
-ln -s "${ANDROID_RELEASE_KEYSTORE}" "${WORKSPACE_KEYSTORE}"
+cp -f "${ANDROID_RELEASE_KEYSTORE}" "${WORKSPACE_KEYSTORE}"
 
 # Configure Gradle
 mkdir -p /root/.gradle
 echo 'RELEASE_STORE_FILE=release.keystore' > /root/.gradle/gradle.properties
 echo 'RELEASE_KEY_ALIAS=fieldnotes' >> /root/.gradle/gradle.properties
 echo "RELEASE_STORE_PASSWORD=${ANDROID_RELEASE_STOREPASS}" >> /root/.gradle/gradle.properties
-echo "RELEASE_KEY_PASSWORD=${ANDROID_RELEASE_STOREPASS}" >> /root/.gradle/gradle.properties
+echo "RELEASE_KEY_PASSWORD=${ANDROID_RELEASE_KEYPASS}" >> /root/.gradle/gradle.properties