From 086483279baba5d7341ca1daecc5633858a7d8a8 Mon Sep 17 00:00:00 2001 From: Mario Vitale Date: Mon, 6 May 2024 15:51:14 +0200 Subject: [PATCH 1/4] Do not merge: support PR for beta build 519 --- .github/workflows/build-android-beta.yml | 12 ++++++++---- .github/workflows/build-pr.yml | 7 ++++--- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build-android-beta.yml b/.github/workflows/build-android-beta.yml index 2f6bfaa6e74..7e5621ad051 100644 --- a/.github/workflows/build-android-beta.yml +++ b/.github/workflows/build-android-beta.yml @@ -6,6 +6,9 @@ on: branches: - build-beta-[0-9]+ - build-beta-android-[0-9]+ + pull_request: + types: + - labeled env: NODE_VERSION: 18.7.0 @@ -21,6 +24,7 @@ jobs: uses: ./.github/actions/test build-and-deploy-android-beta: + if: ${{ github.event.label.name == 'Build App for Android' }} runs-on: ubuntu-22.04 needs: - test @@ -40,7 +44,7 @@ jobs: env: AWS_ACCESS_KEY_ID: "${{ secrets.MM_MOBILE_BETA_AWS_ACCESS_KEY_ID }}" AWS_SECRET_ACCESS_KEY: "${{ secrets.MM_MOBILE_BETA_AWS_SECRET_ACCESS_KEY }}" - MATTERMOST_WEBHOOK_URL: "${{ secrets.MM_MOBILE_BETA_MATTERMOST_WEBHOOK_URL }}" + #MATTERMOST_WEBHOOK_URL: "${{ secrets.MM_MOBILE_BETA_MATTERMOST_WEBHOOK_URL }}" SENTRY_AUTH_TOKEN: "${{ secrets.MM_MOBILE_SENTRY_AUTH_TOKEN }}" SENTRY_DSN_ANDROID: ${{ secrets.MM_MOBILE_BETA_SENTRY_DSN_ANDROID }} SUPPLY_JSON_KEY: ${{ github.workspace }}/mattermost-mobile-private/android/mattermost-credentials.json @@ -48,9 +52,9 @@ jobs: echo "::group::Build" bundle exec fastlane android build --env android.beta echo "::endgroup::" - echo "::group::Deploy to Play Store" - bundle exec fastlane android deploy file:"${{ github.workspace }}/*.apk" --env android.beta - echo "::endgroup::" + #echo "::group::Deploy to Play Store" + #bundle exec fastlane android deploy file:"${{ github.workspace }}/*.apk" --env android.beta + #echo "::endgroup::" working-directory: ./fastlane - name: ci/upload-android-beta-build diff --git a/.github/workflows/build-pr.yml b/.github/workflows/build-pr.yml index 1dbfc5badcb..05cd3b7e3cd 100644 --- a/.github/workflows/build-pr.yml +++ b/.github/workflows/build-pr.yml @@ -1,9 +1,10 @@ --- name: build-pr on: - pull_request: - types: - - labeled + workflow_dispatch: +# pull_request: +# types: +# - labeled env: NODE_VERSION: 18.7.0 From d56d4a1de8f650e30f92749a30a65c8f6b31977c Mon Sep 17 00:00:00 2001 From: Mario Vitale Date: Mon, 6 May 2024 15:55:27 +0200 Subject: [PATCH 2/4] Skip test if label is not Android Beta --- .github/workflows/build-android-beta.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build-android-beta.yml b/.github/workflows/build-android-beta.yml index 7e5621ad051..30b1030c492 100644 --- a/.github/workflows/build-android-beta.yml +++ b/.github/workflows/build-android-beta.yml @@ -16,6 +16,7 @@ env: jobs: test: + if: ${{ github.event.label.name == 'Build App for Android' }} runs-on: ubuntu-22.04 steps: - name: ci/checkout-repo From 5dead95ae6c12c350440dfb07324d51e2b0304c9 Mon Sep 17 00:00:00 2001 From: Mario Vitale Date: Mon, 6 May 2024 16:17:18 +0200 Subject: [PATCH 3/4] Add bundle build task for this PR --- .github/workflows/build-android-beta.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/build-android-beta.yml b/.github/workflows/build-android-beta.yml index 30b1030c492..f2471feb582 100644 --- a/.github/workflows/build-android-beta.yml +++ b/.github/workflows/build-android-beta.yml @@ -49,9 +49,12 @@ jobs: SENTRY_AUTH_TOKEN: "${{ secrets.MM_MOBILE_SENTRY_AUTH_TOKEN }}" SENTRY_DSN_ANDROID: ${{ secrets.MM_MOBILE_BETA_SENTRY_DSN_ANDROID }} SUPPLY_JSON_KEY: ${{ github.workspace }}/mattermost-mobile-private/android/mattermost-credentials.json + ANDROID_BUILD_TASK: "assemble,bundle" run: | echo "::group::Build" bundle exec fastlane android build --env android.beta + find . -name '*.apk' + find . -name '*.aab' echo "::endgroup::" #echo "::group::Deploy to Play Store" #bundle exec fastlane android deploy file:"${{ github.workspace }}/*.apk" --env android.beta @@ -63,3 +66,4 @@ jobs: with: name: android-build-beta-${{ github.run_id }} path: "*.apk" + path: "*.aab" From 6e3d8cac9f971bdac2fc826402a4dacc40c9750c Mon Sep 17 00:00:00 2001 From: Mario Vitale Date: Mon, 6 May 2024 16:22:02 +0200 Subject: [PATCH 4/4] Fix workflow file --- .github/workflows/build-android-beta.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-android-beta.yml b/.github/workflows/build-android-beta.yml index f2471feb582..3164d117b25 100644 --- a/.github/workflows/build-android-beta.yml +++ b/.github/workflows/build-android-beta.yml @@ -65,5 +65,6 @@ jobs: uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3.1.2 with: name: android-build-beta-${{ github.run_id }} - path: "*.apk" - path: "*.aab" + path: | + *.apk + *.aab