ci: final final final adjust builds for rc branch (WPB-8645) 🍒 (#3344)

wireapp · Aug 20, 2024 · 48a778c · 48a778c
1 parent 46eb1f6
commit 48a778c
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 36 deletions.
diff --git a/.github/workflows/build-rc-app.yml b/.github/workflows/build-rc-app.yml
@@ -27,6 +27,7 @@ jobs:
   build-app:
     needs: [ code-analysis, ui-tests, unit-tests ]
     runs-on: ubuntu-latest
+    if: github.event_name == 'merge_group' || (github.event.pull_request.head.repo.full_name == github.repository && github.event_name == 'pull_request')
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -48,20 +49,6 @@ jobs:
           echo $ENCODED_STRING | base64 -di > "${TMP_KEYSTORE_FILE_PATH}"/the.keystore
       - name: Make gradlew executable
         run: chmod +x ./gradlew
-      - name: Build internal flavour APK
-        run:
-          ./gradlew app:assembleInternalCompat
-        env:
-          DATADOG_APP_ID: ${{ secrets.DATADOG_APP_ID }}
-          DATADOG_CLIENT_TOKEN: ${{ secrets.DATADOG_CLIENT_TOKEN }}
-          KEYSTORE_FILE_PATH_DEBUG: ${{ vars.KEYSTORE_FILE_PATH }}
-          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_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: Build Staging flavour
         run:
           ./gradlew app:assembleStagingCompat
@@ -91,18 +78,8 @@ jobs:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           build-flavour: staging
           build-variant: compat
-      - name: Deploy InternalCompat to S3
-        uses: ./.github/actions/deploy-to-s3
-        with:
-          aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
-          aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-          aws-bucket: ${{ secrets.AWS_S3_BUCKET }}
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-          build-flavour: internal
-          build-variant: compat
 
-  ## build release candidate for nightly runs.
-  build-rc:
+  build-app-internal:
     needs: [ code-analysis, ui-tests, unit-tests ]
     runs-on: ubuntu-latest
     if: github.event_name == 'push' && github.ref_name == 'release/candidate'
@@ -118,38 +95,41 @@ jobs:
           java-version: '17'
           distribution: 'temurin'
           cache: gradle
-      - name: Decode release Keystore
+      - name: Decode Keystore
         env:
-          ENCODED_STRING: ${{ secrets.ENCODED_KEYSTORE_PRE_RELEASE }}
+          ENCODED_STRING: ${{ secrets.ENCODED_KEYSTORE_INTERNAL_RELEASE }}
         run: |
           TMP_KEYSTORE_FILE_PATH="${RUNNER_TEMP}"/keystore
+          mkdir "${TMP_KEYSTORE_FILE_PATH}"
           echo $ENCODED_STRING | base64 -di > "${TMP_KEYSTORE_FILE_PATH}"/the.keystore
-      - name: Build Staging flavour
+      - name: Make gradlew executable
+        run: chmod +x ./gradlew
+      - name: Build internal flavour APK
         run:
-          ./gradlew app:assembleStagingRelease
+          ./gradlew app:assembleInternalCompat
         env:
           DATADOG_APP_ID: ${{ secrets.DATADOG_APP_ID }}
           DATADOG_CLIENT_TOKEN: ${{ secrets.DATADOG_CLIENT_TOKEN }}
           KEYSTORE_FILE_PATH_DEBUG: ${{ vars.KEYSTORE_FILE_PATH }}
           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()
         uses: actions/upload-artifact@v4
         with:
           name: Build Artifacts
           path: app/build/outputs/
-      - name: Deploy StagingRelease to S3
+      - name: Deploy InternalCompat to S3
         uses: ./.github/actions/deploy-to-s3
         with:
           aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
           aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
           aws-bucket: ${{ secrets.AWS_S3_BUCKET }}
           github-token: ${{ secrets.GITHUB_TOKEN }}
-          build-flavour: staging
-          build-variant: release
+          build-flavour: internal
+          build-variant: compat
diff --git a/default.json b/default.json
@@ -75,7 +75,7 @@
             "application_is_private_build": true,
             "development_api_enabled": false,
             "encrypt_proteus_storage": true,
-            "analytics_enabled": false,
+            "analytics_enabled": true,
             "analytics_app_key": "8ffae535f1836ed5f58fd5c8a11c00eca07c5438",
             "analytics_server_url": "https://countly.wire.com/"
         },