Build beta 486

.github/actions/prepare-android-build/action.yaml

@@ -47,3 +47,10 @@ runs:
         echo ${STORE_ALIAS} | tee -a android/gradle.properties > /dev/null
         echo ${STORE_PASSWORD} | tee -a android/gradle.properties > /dev/null
         echo "::endgroup::"
+
+    - name: ci/append-fonts-to-build
+      shell: bash
+      run: |
+        echo "::group::append-fonts-to-build"
+        cp ${{ github.workspace }}/mobile-private/fonts/* assets/fonts/
+        echo "::endgroup::"

.github/actions/prepare-ios-build/action.yaml

@@ -23,3 +23,17 @@ runs:
         npm run ios-gems
         npm run pod-install
         echo "::endgroup::"
+
+    - name: ci/checkout-private-repo
+      uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
+      with:
+        repository: infomaniak/mobile-private
+        token: ${{ env.MATTERMOST_BUILD_GH_TOKEN }}
+        path: ${{ github.workspace }}/mobile-private
+
+    - name: ci/append-fonts-to-build
+      shell: bash
+      run: |
+        echo "::group::append-fonts-to-build"
+        cp ${{ github.workspace }}/mobile-private/fonts/* assets/fonts/
+        echo "::endgroup::"

.github/workflows/build-android-beta.yml

@@ -5,8 +5,7 @@ on:
   push:
     branches:
       - build-beta-[0-9]+
-      - build-android-[0-9]+
-      - build-android-beta-[0-9]+
+      - build-beta-android-[0-9]+
 
 env:
   NODE_VERSION: 18.7.0

.github/workflows/build-ios-beta.yml

@@ -21,34 +21,6 @@ jobs:
       - name: ci/test
         uses: ./.github/actions/test
 
-  build-ios-simulator:
-    runs-on: macos-12
-    if: ${{ !contains(github.ref_name, 'beta-ios') }}
-    needs:
-      - test
-    steps:
-      - name: ci/checkout-repo
-        uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
-
-      - name: ci/prepare-ios-build
-        uses: ./.github/actions/prepare-ios-build
-
-      - name: ci/build-ios-simulator
-        env:
-          TAG: "${{ github.ref_name }}"
-          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 }}"
-          GITHUB_TOKEN: "${{ secrets.MM_MOBILE_GITHUB_TOKEN }}"
-        run: bundle exec fastlane ios simulator --env ios.simulator
-        working-directory: ./fastlane
-
-      - name: ci/upload-ios-pr-simulator
-        uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3.1.2
-        with:
-          name: ios-build-simulator-${{ github.run_id }}
-          path: Mattermost-simulator-x86_64.app.zip
-
   build-and-deploy-ios-beta:
     runs-on: macos-12
     if: ${{ !contains(github.ref_name, 'beta-sim') }}
@@ -69,6 +41,8 @@ jobs:
 
       - name: ci/prepare-ios-build
         uses: ./.github/actions/prepare-ios-build
+        env:
+          MATTERMOST_BUILD_GH_TOKEN: "${{ secrets.MATTERMOST_BUILD_GH_TOKEN }}"
 
       - name: ci/build-and-deploy-ios-beta
         env:

.github/workflows/build-ios-release.yml

@@ -32,6 +32,8 @@ jobs:
 
       - name: ci/prepare-ios-build
         uses: ./.github/actions/prepare-ios-build
+        env:
+          MATTERMOST_BUILD_GH_TOKEN: "${{ secrets.MATTERMOST_BUILD_GH_TOKEN }}"
 
       - name: ci/output-ssh-private-key
         shell: bash
@@ -70,30 +72,3 @@ jobs:
           name: ios-build-release-${{ github.run_id }}
           path: "*.ipa"
 
-  build-ios-simulator:
-    runs-on: macos-12
-    if: ${{ !contains(github.ref_name , 'release-ios') }}
-    needs:
-      - test
-    steps:
-      - name: ci/checkout-repo
-        uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
-
-      - name: ci/prepare-ios-build
-        uses: ./.github/actions/prepare-ios-build
-
-      - name: ci/build-ios-simulator
-        env:
-          TAG: "${{ github.ref_name }}"
-          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 }}"
-          GITHUB_TOKEN: "${{ secrets.MM_MOBILE_GITHUB_TOKEN }}"
-        run: bundle exec fastlane ios simulator --env ios.simulator
-        working-directory: ./fastlane
-
-      - name: ci/upload-ios-pr-simulator
-        uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3.1.2
-        with:
-          name: ios-build-simulator-${{ github.run_id }}
-          path: Mattermost-simulator-x86_64.app.zip

.github/workflows/build-pr.yml

@@ -1,11 +1,9 @@
 ---
 name: build-pr
 on:
-  push:
-    branches:
-      - build-pr-*
-      - build-pr-android-*
-      - build-pr-ios-*
+  pull_request:
+    types:
+      - labeled
 
 env:
   NODE_VERSION: 18.7.0
@@ -14,23 +12,30 @@ env:
 jobs:
   test:
     runs-on: ubuntu-22.04
+    if: ${{ github.event.label.name == 'Build Apps for PR' || github.event.label.name == 'Build App for iOS' || github.event.label.name == 'Build App for Android' }}
     steps:
       - name: ci/checkout-repo
         uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
+        with:
+          ref: ${{ github.event.pull_request.head.sha }}
       - name: ci/test
         uses: ./.github/actions/test
 
   build-ios-pr:
     runs-on: macos-12
-    if: ${{ !contains(github.ref_name, 'android') }}
+    if: ${{ github.event.label.name == 'Build Apps for PR' || github.event.label.name == 'Build App for iOS' }}
     needs:
       - test
     steps:
       - name: ci/checkout-repo
         uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
+        with:
+          ref: ${{ github.event.pull_request.head.sha }}
 
       - name: ci/prepare-ios-build
         uses: ./.github/actions/prepare-ios-build
+        env:
+          MATTERMOST_BUILD_GH_TOKEN: "${{ secrets.MATTERMOST_BUILD_GH_TOKEN }}"
 
       - name: ci/output-ssh-private-key
         shell: bash
@@ -43,7 +48,7 @@ jobs:
 
       - name: ci/build-ios-pr
         env:
-          BRANCH_TO_BUILD: "${{ github.ref_name }}"
+          BRANCH_TO_BUILD: "${{ github.event.pull_request.head.ref }}"
           AWS_ACCESS_KEY_ID: "${{ secrets.MM_MOBILE_PR_AWS_ACCESS_KEY_ID }}"
           AWS_SECRET_ACCESS_KEY: "${{ secrets.MM_MOBILE_PR_AWS_SECRET_ACCESS_KEY }}"
           FASTLANE_TEAM_ID: "${{ secrets.MM_MOBILE_FASTLANE_TEAM_ID }}"
@@ -64,12 +69,14 @@ jobs:
 
   build-android-pr:
     runs-on: ubuntu-22.04
-    if: ${{ !contains(github.ref_name, 'ios') }}
+    if: ${{ github.event.label.name == 'Build Apps for PR' || github.event.label.name == 'Build App for Android' }}
     needs:
       - test
     steps:
       - name: ci/checkout-repo
         uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
+        with:
+          ref: ${{ github.event.pull_request.head.sha }}
 
       - name: ci/prepare-android-build
         uses: ./.github/actions/prepare-android-build
@@ -81,7 +88,7 @@ jobs:
 
       - name: ci/build-android-pr
         env:
-          BRANCH_TO_BUILD: "${{ github.ref_name }}"
+          BRANCH_TO_BUILD: "${{ github.event.pull_request.head.ref }}"
           AWS_ACCESS_KEY_ID: "${{ secrets.MM_MOBILE_PR_AWS_ACCESS_KEY_ID }}"
           AWS_SECRET_ACCESS_KEY: "${{ secrets.MM_MOBILE_PR_AWS_SECRET_ACCESS_KEY }}"
           MATTERMOST_WEBHOOK_URL: "${{ secrets.MM_MOBILE_PR_MATTERMOST_WEBHOOK_URL }}"

.github/workflows/ci.yml

@@ -1,6 +1,10 @@
 ---
 name: ci
 on:
+  push:
+    branches:
+      - main
+      - 'release*'
   pull_request:
 
 env:

.github/workflows/github-release.yml

@@ -24,6 +24,8 @@ jobs:
 
       - name: ci/prepare-ios-build
         uses: ./.github/actions/prepare-ios-build
+        env:
+          MATTERMOST_BUILD_GH_TOKEN: "${{ secrets.MATTERMOST_BUILD_GH_TOKEN }}"
 
       - name: ci/output-ssh-private-key
         shell: bash

.gitignore

@@ -1,4 +1,5 @@
 assets/override
+assets/fonts/SuisseIntl*.ttf
 dist
 build-ios
 *.zip

.solidarity

@@ -39,7 +39,7 @@
       {
         "rule": "cli",
         "binary": "pod",
-        "semver": "1.12.1",
+        "semver": "1.14.3",
         "platform": "darwin"
       }
     ],