Merge branch 'main' into feat/wallet-add-biometrics

TERITORI · Feb 16, 2024 · bf7ffc2 · bf7ffc2
2 parents 3754567 + 1d95498
commit bf7ffc2
Show file tree

Hide file tree

Showing 60 changed files with 1,711 additions and 1,394 deletions.
diff --git a/.github/workflows/mobile-build-android.yml b/.github/workflows/mobile-build-android.yml
@@ -36,6 +36,14 @@ jobs:
       - name: Install node modules
         run: yarn install
 
+      - name: Bump android versionNumber
+        if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' }}
+        run: make bump-app-build-number
+
+      - name: Download service account from env
+        if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' }}
+        run: echo ${{ secrets.GOOGLE_SERVICES_JSON }} | base64 --decode > ./service-account-android-submit.json
+
       - name: Fix gitignore
         run: npx tsx ./packages/scripts/app-build/fixGitignore.ts
 
@@ -57,17 +65,20 @@ jobs:
       - name: Build android
         run: eas build --local --non-interactive --platform=android
 
-      - name: EAS Submit aab
+      - name: Update aab File path
         run: |
           AAB_FILE=$(find ./ -name 'build-*.aab' -type f)
           if [ -z "$AAB_FILE" ]; then
             echo "Error: apk file not found."
             exit 1
           fi
 
-          # eas submit --platform=android --path=$AAB_FILE --profile=production
           echo "AAB_FILE=$AAB_FILE" >> $GITHUB_ENV
 
+      - name: EAS Submit Android aab
+        if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' }}
+        run: eas submit --platform=android --path=${{ env.AAB_FILE }} --profile=production
+
       - name: Upload aab
         uses: actions/upload-artifact@v3
         with:

diff --git a/.github/workflows/mobile-build-ios.yml b/.github/workflows/mobile-build-ios.yml
@@ -38,7 +38,7 @@ jobs:
 
       - name: Bump ios buildNumber
         if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' }}
-        run: make bump-ios-build-number
+        run: make bump-app-build-number
 
       - name: Fix gitignore
         run: npx tsx ./packages/scripts/app-build/fixGitignore.ts