From 6c1e41ba1050c92f4b615f7e857e0d085120a242 Mon Sep 17 00:00:00 2001 From: Harsh Shandilya Date: Fri, 16 Oct 2020 20:48:11 +0530 Subject: Revamp build configuration (#1156) * release: move scripts to scripts directory Signed-off-by: Harsh Shandilya * Move CI secrets to secrets directory Signed-off-by: Harsh Shandilya * gradle: uprev to 6.7 Signed-off-by: Harsh Shandilya * gradle: suppress warnings about unsupported options Signed-off-by: Harsh Shandilya * build: update dependencies Signed-off-by: Harsh Shandilya * build: move Gradle plugins to ext Signed-off-by: Harsh Shandilya * build: move configuration tasks to buildSrc Signed-off-by: Harsh Shandilya * CHANGELOG: add entry for #1137 Signed-off-by: Harsh Shandilya * Fix lint warnings Signed-off-by: Harsh Shandilya --- release/deploy-snapshot.sh | 13 ------------- release/encrypt-secret.sh | 15 --------------- release/keystore.cipher | Bin 4336 -> 0 bytes release/props.cipher | Bin 144 -> 0 bytes release/signing-cleanup.sh | 8 -------- release/signing-setup.sh | 16 ---------------- 6 files changed, 52 deletions(-) delete mode 100755 release/deploy-snapshot.sh delete mode 100755 release/encrypt-secret.sh delete mode 100644 release/keystore.cipher delete mode 100644 release/props.cipher delete mode 100755 release/signing-cleanup.sh delete mode 100755 release/signing-setup.sh (limited to 'release') diff --git a/release/deploy-snapshot.sh b/release/deploy-snapshot.sh deleted file mode 100755 index 80606f67..00000000 --- a/release/deploy-snapshot.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/usr/bin/env sh -set -ex - -export SSHDIR="$HOME/.ssh" -mkdir -p "$SSHDIR" -echo "$ACTIONS_DEPLOY_KEY" > "$SSHDIR/key" -chmod 600 "$SSHDIR/key" -export SERVER_DEPLOY_STRING="$SSH_USERNAME@$SERVER_ADDRESS:$SERVER_DESTINATION" -mkdir -p "$GITHUB_WORKSPACE/APS" -cp -v ./app/build/outputs/apk/free/release/*.apk "$GITHUB_WORKSPACE/APS/" -cp -v ./app/build/outputs/apk/nonFree/release/*.apk "$GITHUB_WORKSPACE/APS/" -cd "$GITHUB_WORKSPACE/APS" -rsync -ahvcr --omit-dir-times --progress --delete --no-o --no-g -e "ssh -i $SSHDIR/key -o StrictHostKeyChecking=no -p $SSH_PORT" . "$SERVER_DEPLOY_STRING" diff --git a/release/encrypt-secret.sh b/release/encrypt-secret.sh deleted file mode 100755 index 7c762d19..00000000 --- a/release/encrypt-secret.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/usr/bin/env bash -set -ex - -# Simple script that uses OpenSSL to encrypt a provided file with a provided key, and writes the result -# to the provided path. Yes it's very needy. - -INPUT_FILE=$1 -OUTPUT_FILE=$2 -ENCRYPT_KEY=$3 - -if [[ -n "$ENCRYPT_KEY" && -n "$INPUT_FILE" && -n "$OUTPUT_FILE" ]]; then - openssl enc -aes-256-cbc -md sha256 -pbkdf2 -e -in "${INPUT_FILE}" -out "${OUTPUT_FILE}" -k "${ENCRYPT_KEY}" -else - echo "Usage: ./encrypt-secret.sh " -fi diff --git a/release/keystore.cipher b/release/keystore.cipher deleted file mode 100644 index 900e3685..00000000 Binary files a/release/keystore.cipher and /dev/null differ diff --git a/release/props.cipher b/release/props.cipher deleted file mode 100644 index 4ea92b1b..00000000 Binary files a/release/props.cipher and /dev/null differ diff --git a/release/signing-cleanup.sh b/release/signing-cleanup.sh deleted file mode 100755 index d529c4e9..00000000 --- a/release/signing-cleanup.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/env bash -set -ex - -# Delete Release key -rm -f keystore.jks - -# Delete signing config -rm -f keystore.properties diff --git a/release/signing-setup.sh b/release/signing-setup.sh deleted file mode 100755 index e930e04d..00000000 --- a/release/signing-setup.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/usr/bin/env bash -set -e - -ENCRYPT_KEY=$1 - -declare -A SECRETS -SECRETS[release/keystore.cipher]=keystore.jks -SECRETS[release/props.cipher]=keystore.properties - -if [[ -n "$ENCRYPT_KEY" ]]; then - for src in "${!SECRETS[@]}"; do - openssl enc -aes-256-cbc -md sha256 -pbkdf2 -d -in "${src}" -out "${SECRETS[${src}]}" -k "${ENCRYPT_KEY}" - done -else - echo "Usage: ./signing-setup.sh " -fi -- cgit v1.2.3