diff options
| -rw-r--r-- | .github/actions/deploy/action.yml | 4 | ||||
| -rwxr-xr-x | .github/actions/deploy/deploy.sh | 3 | ||||
| -rw-r--r-- | .github/workflows/deploy.yml | 13 | ||||
| -rw-r--r-- | dotfiles.lst | 3 | ||||
| -rw-r--r-- | gradle/apk_module.gradle | 2 | ||||
| -rw-r--r-- | ime/app/build.gradle | 1 |
6 files changed, 5 insertions, 21 deletions
diff --git a/.github/actions/deploy/action.yml b/.github/actions/deploy/action.yml index fbdf01e0a..913f9e5f4 100644 --- a/.github/actions/deploy/action.yml +++ b/.github/actions/deploy/action.yml @@ -19,9 +19,6 @@ inputs: keystore_password: default: "" required: false - keystore_key_alias: - default: "" - required: false keystore_key_password: default: "" required: false @@ -47,7 +44,6 @@ runs: - ${{ inputs.crash_report_email }} - ${{ inputs.keystore_url }} - ${{ inputs.keystore_password }} - - ${{ inputs.keystore_key_alias }} - ${{ inputs.keystore_key_password }} - ${{ inputs.publish_service_account_creds_url }} - ${{ inputs.publish_service_account }} diff --git a/.github/actions/deploy/deploy.sh b/.github/actions/deploy/deploy.sh index 264afe617..9e28844a6 100755 --- a/.github/actions/deploy/deploy.sh +++ b/.github/actions/deploy/deploy.sh @@ -11,8 +11,6 @@ KEYSTORE_FILE_URL="${1}" shift export KEY_STORE_FILE_PASSWORD="${1}" shift -export KEY_STORE_FILE_DEFAULT_ALIAS="${1}" -shift export KEY_STORE_FILE_DEFAULT_ALIAS_PASSWORD="${1}" shift PUBLISH_CERT_FILE_URL="${1}" @@ -20,7 +18,6 @@ shift export PUBLISH_APK_SERVICE_ACCOUNT_EMAIL="${1}" shift - export BUILD_COUNT_FOR_VERSION=${GITHUB_RUN_NUMBER} if [[ -z "${KEYSTORE_FILE_URL}" ]]; then diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index be787b362..c7fb02417 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -25,27 +25,14 @@ jobs: - name: setup run: ./scripts/ci/ci_setup.sh - uses: ./.github/actions/deploy - if: startsWith(github.event.deployment.environment, 'app') with: deploy_target: ${{ github.event.deployment.environment }} crash_report_email: ${{ secrets.ANYSOFTKEYBOARD_CRASH_REPORT_EMAIL }} keystore_url: ${{ secrets.ANYSOFTKEYBOARD_KEYSTORE_URL }} keystore_password: ${{ secrets.ANYSOFTKEYBOARD_KEYSTORE_PASSWORD }} - keystore_key_alias: ${{ secrets.ANYSOFTKEYBOARD_KEYSTORE_ALIAS }} keystore_key_password: ${{ secrets.ANYSOFTKEYBOARD_KEYSTORE_KEY_PASSWORD }} publish_service_account_creds_url: ${{ secrets.PUBLISH_CERT_FILE_URL }} publish_service_account: ${{ secrets.PUBLISH_APK_SERVICE_ACCOUNT_EMAIL }} - - uses: ./.github/actions/deploy - if: startsWith(github.event.deployment.environment, 'addons') - with: - deploy_target: ${{ github.event.deployment.environment }} - crash_report_email: ${{ secrets.ANYSOFTKEYBOARD_CRASH_REPORT_EMAIL }} - keystore_url: ${{ secrets.PACK_KEYSTORE_URL }} - keystore_password: ${{ secrets.PACK_KEYSTORE_PASSWORD }} - keystore_key_alias: ${{ secrets.PACK_KEYSTORE_ALIAS }} - keystore_key_password: ${{ secrets.PACK_KEYSTORE_KEY_PASSWORD }} - publish_service_account_creds_url: ${{ secrets.PUBLISH_CERT_FILE_URL }} - publish_service_account: ${{ secrets.PUBLISH_APK_SERVICE_ACCOUNT_EMAIL }} - uses: actions/upload-artifact@v1.0.0 with: name: apks diff --git a/dotfiles.lst b/dotfiles.lst new file mode 100644 index 000000000..4caf4283a --- /dev/null +++ b/dotfiles.lst @@ -0,0 +1,3 @@ +encrypted:secrets_rc:/Users/menny/.secrets_rc +encrypted:secrets_rc:/Users/menny/.secrets_rc +encrypted:secrets_rc:/Users/menny/.secrets_rc diff --git a/gradle/apk_module.gradle b/gradle/apk_module.gradle index 510008458..1b1636df0 100644 --- a/gradle/apk_module.gradle +++ b/gradle/apk_module.gradle @@ -54,7 +54,7 @@ android { if (keystoreFile.exists()) { storeFile keystoreFile storePassword System.getenv("KEY_STORE_FILE_PASSWORD") - keyAlias getExtValue(project, "override_release_key_alias", System.getenv("KEY_STORE_FILE_DEFAULT_ALIAS")) + keyAlias getExtValue(project, "override_release_key_alias", 'packs') keyPassword System.getenv("KEY_STORE_FILE_DEFAULT_ALIAS_PASSWORD") println "Using '${storeFile.absolutePath}' to release APK ${path} (with alias '${keyAlias}')." } else { diff --git a/ime/app/build.gradle b/ime/app/build.gradle index 91fc40a1f..86ff68174 100644 --- a/ime/app/build.gradle +++ b/ime/app/build.gradle @@ -2,6 +2,7 @@ group 'net.evendanan' ext.override_app_id = 'com.menny.android.anysoftkeyboard' ext.shouldBePublished = true +ext.override_release_key_alias = 'anysoftkeyboard' apply from: "${rootDir}/gradle/apk_module.gradle" |