Merge branch 'main' into network_issue_in_android

.github/workflows/alpha_version.yml

@@ -1,4 +1,4 @@
-name: '🧪 and 📢 and 📲'
+name: 🤖🌈 Droid Alpha Skunkworks
 
 on:
   push:

.github/workflows/beta_version.yml

@@ -1,22 +1,21 @@
-name: 'publish beta'
+name: 🤖🎯 Droid Beta Launchpad
 
 on:
-  workflow_dispatch:
-    inputs:
-      platform:
-        description: 'Select platform(s) to build'
-        required: true
-        default: 'both'
-        type: choice
-        options:
-          - android
-          - ios
-          - both
+  push:
+    branches: ['stable']
 
 jobs:
-  distribute_android:
-    if: ${{ github.event.inputs.platform == 'android' || github.event.inputs.platform == 'both' }}
+  tests:
+    uses: ./.github/workflows/test.yml
+    with:
+      backend-url: http://localhost:8090
+      user-email: ${{ vars.USER_EMAIL }}
+      user-password: ${{ vars.USER_PASSWORD }}
+      user-seed: ${{ vars.USER_SEED }}
+
+  distribute:
     uses: ./.github/workflows/distribute.yml
+    needs: tests
     with:
       backend-url: ${{ vars.PUBLIC_BACKEND_URL }}
       lane: beta
@@ -26,56 +25,3 @@ jobs:
       keystore-alias: ${{ secrets.BUNDLE_BETA_PLAYSTORE_ALIAS }}
       keystore-password: ${{ secrets.BUNDLE_BETA_PASSWORD }}
       keystore-key-password: ${{ secrets.BUNDLE_BETA_PASSWORD }}
-
-  distribute_ios:
-    runs-on: macOS-latest
-    environment: ios
-    if: ${{ github.event.inputs.platform == 'ios' || github.event.inputs.platform == 'both' }}
-    steps:
-      - uses: dyne/pnpm@main
-        with:
-          node-version: '20.11.1'
-          submodules: true
-      - name: Set env
-        run: echo "PUBLIC_BACKEND_URL=${{vars.PUBLIC_BACKEND_URL}}" >> $GITHUB_ENV
-      - name: Install dependencies
-        id: install_code
-        run: pnpm install
-      - name: Build
-        id: build_code
-        run: pnpm build
-      - uses: actions/cache@v3
-        with:
-          path: ios/App/Pods
-          key: ${{ runner.os }}-pods-${{ hashFiles('**/Podfile.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-pods-
-      - name: Sync
-        id: sync_code
-        run: pnpm cap sync ios
-      - uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: '3.0'
-          bundler-cache: true
-      - uses: maierj/[email protected]
-        env:
-          APP_STORE_CONNECT_TEAM_ID: ${{ secrets.APP_STORE_CONNECT_TEAM_ID }}
-          BUNDLE_IDENTIFIER: ${{ secrets.BUNDLE_IDENTIFIER }}
-          BUILD_CERTIFICATE_BASE64: ${{ secrets.IOS_BUILD_CERTIFICATE }}
-          BUILD_PROVISION_PROFILE_BASE64: ${{ secrets.IOS_BUILD_PROVISION_PROFILE }}
-          APPLE_KEY_ID: ${{ secrets.APPLE_KEY_ID }}
-          APPLE_ISSUER_ID: ${{ secrets.APPLE_ISSUER_ID }}
-          APPLE_KEY_CONTENT: ${{ secrets.APPLE_KEY_CONTENT }}
-          APPLE_PROFILE_NAME: ${{ secrets.APPLE_PROFILE_NAME }}
-          P12_PASSWORD: ${{ secrets.P12_PASSWORD }}
-          DEMO_USER: ${{ vars.USER_EMAIL }}
-          DEMO_PASSWORD: ${{ vars.USER_PASSWORD }}
-        with:
-          lane: ios production
-      - name: Upload release bundle
-        uses: actions/upload-artifact@v4
-        with:
-          name: ios-release
-          path: ./App.ipa
-          retention-days: 10
-

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

@@ -1,4 +1,4 @@
-name: Build source code on ios and upload to testflight
+name: 🍏✨ Flight of the iPhoenix
 
 on:
   pull_request:

.github/workflows/firebase_version.yml

@@ -1,4 +1,4 @@
-name: '🧪 and 📢 and 📲'
+name: 🔥📲 Droid FireDrop
 
 on:
   pull_request:

.github/workflows/github_version.yml

@@ -1,4 +1,4 @@
-name: Build github release
+name: 🐙📦 OctoShip Delivery
 
 on:
   push:
@@ -7,20 +7,10 @@ jobs:
   build_android:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
-      - name: Git Sumbodule Update
-        run: |
-          git submodule update --init
-      - name: Install Node.js
-        uses: actions/setup-node@v4
-        with:
-          node-version: 20.11
-      - uses: pnpm/action-setup@v2
-        name: Install pnpm
+      - uses: dyne/pnpm@main
         with:
-          version: 8
-          run_install: false
-
+          submodules: true
+          node-version: '20.11.1'
       - uses: actions/cache@v3
         with:
           path: |
@@ -71,18 +61,10 @@ jobs:
       release: ${{ steps.tag_release.outputs.release }}
       version: ${{ steps.tag_release.outputs.version }}
     steps:
-      - uses: actions/checkout@v4
-      - name: Setup Node.js 20
-        uses: actions/setup-node@v4
+      - uses: dyne/pnpm@main
         with:
-          node-version: 20.11
-      - uses: pnpm/action-setup@v2
-        name: Install pnpm
-        with:
-          version: 8
-      - name: Install deps
-        run: |
-          pnpm i
+          submodules: true
+          node-version: '20.11.1'
       - name: Tag release
         id: tag_release
         env:

.github/workflows/publish_on_production.yml

@@ -0,0 +1,80 @@
+name: 🚀🌍 Universal Stardust Release
+
+on:
+  workflow_dispatch:
+    inputs:
+      platform:
+        description: 'Select platform(s) to build'
+        required: true
+        default: 'both'
+        type: choice
+        options:
+          - android
+          - ios
+          - both
+
+jobs:
+  distribute_android:
+    if: ${{ github.ref == 'refs/heads/stable'&&(github.event.inputs.platform == 'android' || github.event.inputs.platform == 'both') }}
+    uses: ./.github/workflows/distribute.yml
+    with:
+      backend-url: ${{ vars.PUBLIC_BACKEND_URL }}
+      lane: production
+    secrets:
+      keystore-file: ${{ secrets.BUNDLE_BETA_PLAYSTORE }}
+      service-account: ${{ secrets.PLAYSTORE_SERVICE_ACCOUNT }}
+      keystore-alias: ${{ secrets.BUNDLE_BETA_PLAYSTORE_ALIAS }}
+      keystore-password: ${{ secrets.BUNDLE_BETA_PASSWORD }}
+      keystore-key-password: ${{ secrets.BUNDLE_BETA_PASSWORD }}
+
+  distribute_ios:
+    runs-on: macOS-latest
+    environment: ios
+    if: ${{ github.ref == 'refs/heads/stable'&&(github.event.inputs.platform == 'ios' || github.event.inputs.platform == 'both') }}
+    steps:
+      - uses: dyne/pnpm@main
+        with:
+          node-version: '20.11.1'
+          submodules: true
+      - name: Set env
+        run: echo "PUBLIC_BACKEND_URL=${{vars.PUBLIC_BACKEND_URL}}" >> $GITHUB_ENV
+      - name: Install dependencies
+        id: install_code
+        run: pnpm install
+      - name: Build
+        id: build_code
+        run: pnpm build
+      - uses: actions/cache@v3
+        with:
+          path: ios/App/Pods
+          key: ${{ runner.os }}-pods-${{ hashFiles('**/Podfile.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-pods-
+      - name: Sync
+        id: sync_code
+        run: pnpm cap sync ios
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: '3.0'
+          bundler-cache: true
+      - uses: maierj/[email protected]
+        env:
+          APP_STORE_CONNECT_TEAM_ID: ${{ secrets.APP_STORE_CONNECT_TEAM_ID }}
+          BUNDLE_IDENTIFIER: ${{ secrets.BUNDLE_IDENTIFIER }}
+          BUILD_CERTIFICATE_BASE64: ${{ secrets.IOS_BUILD_CERTIFICATE }}
+          BUILD_PROVISION_PROFILE_BASE64: ${{ secrets.IOS_BUILD_PROVISION_PROFILE }}
+          APPLE_KEY_ID: ${{ secrets.APPLE_KEY_ID }}
+          APPLE_ISSUER_ID: ${{ secrets.APPLE_ISSUER_ID }}
+          APPLE_KEY_CONTENT: ${{ secrets.APPLE_KEY_CONTENT }}
+          APPLE_PROFILE_NAME: ${{ secrets.APPLE_PROFILE_NAME }}
+          P12_PASSWORD: ${{ secrets.P12_PASSWORD }}
+          DEMO_USER: ${{ vars.USER_EMAIL }}
+          DEMO_PASSWORD: ${{ vars.USER_PASSWORD }}
+        with:
+          lane: ios production
+      - name: Upload release bundle
+        uses: actions/upload-artifact@v4
+        with:
+          name: ios-release
+          path: ./App.ipa
+          retention-days: 10

.github/workflows/translations.yml

@@ -15,7 +15,6 @@ jobs:
       - uses: dyne/pnpm@main
         with:
           node-version: 20
-          pnpm: 8
           submodules: true
       - run: |
           pnpm no-literals

.tool-versions

@@ -1,2 +1,2 @@
 java adoptopenjdk-17.0.9+9
-pnpm 8
+pnpm 9