From ae05a7060676e3c226510c849f9a70ac9b46485d Mon Sep 17 00:00:00 2001 From: yamilmedina Date: Mon, 29 Jul 2024 10:36:49 +0200 Subject: [PATCH 1/2] ci: change buildtype for rc prs --- .github/workflows/build-rc-app.yml | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/.github/workflows/build-rc-app.yml b/.github/workflows/build-rc-app.yml index 4560103b076..9270aecc98a 100644 --- a/.github/workflows/build-rc-app.yml +++ b/.github/workflows/build-rc-app.yml @@ -61,15 +61,9 @@ jobs: KEYPWD_COMPAT: ${{ secrets.SIGNING_KEY_PASSWORD_INTERNAL_RELEASE }} KEYSTOREPWD_COMPAT: ${{ secrets.SIGNING_STORE_PASSWORD_INTERNAL_RELEASE }} ENABLE_SIGNING: ${{ secrets.ENABLE_SIGNING }} - - name: Decode release Keystore - env: - ENCODED_STRING: ${{ secrets.ENCODED_KEYSTORE_PRE_RELEASE }} - run: | - TMP_KEYSTORE_FILE_PATH="${RUNNER_TEMP}"/keystore - echo $ENCODED_STRING | base64 -di > "${TMP_KEYSTORE_FILE_PATH}"/the.keystore - name: Build Staging flavour run: - ./gradlew app:assembleStagingRelease + ./gradlew app:assembleStagingCompat env: DATADOG_APP_ID: ${{ secrets.DATADOG_APP_ID }} DATADOG_CLIENT_TOKEN: ${{ secrets.DATADOG_CLIENT_TOKEN }} @@ -77,9 +71,9 @@ jobs: KEYSTORE_FILE_PATH_RELEASE: ${{ vars.KEYSTORE_FILE_PATH }} KEYSTORE_FILE_PATH_COMPAT: ${{ vars.KEYSTORE_FILE_PATH }} KEYSTORE_FILE_PATH_COMPAT_RELEASE: ${{ vars.KEYSTORE_FILE_PATH }} - KEYSTORE_KEY_NAME_RELEASE: ${{ secrets.SIGNING_KEY_ALIAS_PRE_RELEASE }} - KEYPWD_RELEASE: ${{ secrets.SIGNING_KEY_PASSWORD_PRE_RELEASE }} - KEYSTOREPWD_RELEASE: ${{ secrets.SIGNING_STORE_PASSWORD_PRE_RELEASE }} + KEYSTORE_KEY_NAME_COMPAT: ${{ secrets.SIGNING_KEY_ALIAS_INTERNAL_RELEASE }} + KEYPWD_COMPAT: ${{ secrets.SIGNING_KEY_PASSWORD_INTERNAL_RELEASE }} + KEYSTOREPWD_COMPAT: ${{ secrets.SIGNING_STORE_PASSWORD_INTERNAL_RELEASE }} ENABLE_SIGNING: ${{ secrets.ENABLE_SIGNING }} - name: Upload if: success() @@ -95,7 +89,7 @@ jobs: aws-bucket: ${{ secrets.AWS_S3_BUCKET }} github-token: ${{ secrets.GITHUB_TOKEN }} build-flavour: staging - build-variant: release + build-variant: compat - name: Deploy InternalCompat to S3 uses: ./.github/actions/deploy-to-s3 with: From 52ce1c85d6b114574038db5479f1d697f85fb696 Mon Sep 17 00:00:00 2001 From: yamilmedina Date: Mon, 29 Jul 2024 10:40:16 +0200 Subject: [PATCH 2/2] ci: change buildtype for rc prs --- .github/workflows/build-rc-app.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-rc-app.yml b/.github/workflows/build-rc-app.yml index 9270aecc98a..0064627e370 100644 --- a/.github/workflows/build-rc-app.yml +++ b/.github/workflows/build-rc-app.yml @@ -81,7 +81,7 @@ jobs: with: name: Build Artifacts path: app/build/outputs/ - - name: Deploy StagingRelease to S3 + - name: Deploy StagingCompat to S3 uses: ./.github/actions/deploy-to-s3 with: aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}