Merge branch 'main' into join_organizations

ForkbombEu · Dec 10, 2024 · 5094095 · 5094095
2 parents 31a1186 + 26fa2e7
commit 5094095
Show file tree

Hide file tree

Showing 75 changed files with 8,952 additions and 7,072 deletions.
diff --git a/.github/workflows/alpha_version.yml b/.github/workflows/alpha_version.yml
@@ -1,100 +1,27 @@
-name: '🧪 and 📢 and 📲'
+name: 🤖🌈 Droid Alpha Skunkworks
 
 on:
   push:
     branches: ['main']
+
 jobs:
   tests:
-    runs-on: ubuntu-latest
-    environment: test
-    steps:
-      - uses: actions/checkout@v4
-      - uses: dyne/pnpm@main
-        with:
-          node-version: '20.11.1'
-          submodules: true
-      - uses: actions/setup-go@v5
-        with:
-          go-version: '1.22'
-      - uses: supplypike/setup-bin@v4
-        with:
-          uri: https://github.com/dyne/zenroom/releases/latest/download/zencode-exec
-          name: zencode-exec
-          version: latest
-      - run: |
-          git clone --recursive https://github.com/forkbombeu/signroom
-          cd signroom/admin
-          mkdir pb_data
-          cp ../../tests/fixtures/test.db pb_data/data.db
-          rm pb_migrations/1685000000_seed_features.js
-          go build
-          ./pb migrate
-          ./pb serve &
-      - run: npx playwright install --with-deps
-      - run: pnpm test:integration --workers 1
-        env:
-          PUBLIC_BACKEND_URL: http://localhost:8090
-          USER_EMAIL: ${{ vars.USER_EMAIL }}
-          USER_PASSWORD: ${{ vars.USER_PASSWORD }}
-          USER_SEED: ${{ vars.USER_SEED }}
-      - uses: actions/upload-artifact@v4
-        if: ${{ !cancelled() }}
-        with:
-          name: test-results
-          path: test-results/
-          retention-days: 10
+    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:
-    runs-on: ubuntu-latest
-    environment: test
+    uses: ./.github/workflows/distribute.yml
     needs: tests
-    steps:
-      - uses: dyne/pnpm@main
-        with:
-          submodules: true
-          node-version: '20.11.1'
-      - uses: actions/cache@v4
-        with:
-          path: |
-            ~/.gradle/caches
-            ~/.gradle/wrapper
-          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
-          restore-keys: |
-            ${{ runner.os }}-gradle-
-      - name: Setup java
-        uses: actions/setup-java@v4
-        with:
-          distribution: zulu
-          java-version: '17'
-      - name: Decode Keystore File
-        uses: timheuer/base64-to-file@v1
-        id: playstore_keystore
-        with:
-          fileName: android_keystore.keystore
-          encodedString: ${{ secrets.BUNDLE_BETA_PLAYSTORE }}
-      - name: Decode Service Account File for Firebase
-        uses: timheuer/base64-to-file@v1
-        id: service_account
-        with:
-          fileName: play-store-credentials.json
-          encodedString: ${{ secrets.FIREBASE_SERVICE_ACCOUNT }}
-      - name: Decode Service Account File for PlayStore
-        uses: timheuer/base64-to-file@v1
-        id: play_console_account
-        with:
-          fileName: play-store-credentials.json
-          encodedString: ${{ secrets.PLAYSTORE_SERVICE_ACCOUNT }}
-      - uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: '3.0'
-          bundler-cache: true
-      - uses: maierj/[email protected]
-        env:
-          KEYSTORE_PATH: ${{ steps.playstore_keystore.outputs.filePath }}
-          SERVICE_ACCOUNT_PATH: ${{ steps.play_console_account.outputs.filePath }}
-          KEYSTORE_KEY_ALIAS: ${{ secrets.BUNDLE_BETA_PLAYSTORE_ALIAS }}
-          KEYSTORE_KEY_PASSWORD: ${{ secrets.BUNDLE_BETA_PASSWORD }}
-          KEYSTORE_STORE_PASSWORD: ${{ secrets.BUNDLE_BETA_PASSWORD }}
-          PUBLIC_BACKEND_URL: ${{ vars.PUBLIC_BACKEND_URL }}
-        with:
-          lane: alpha
+    with:
+      backend-url: ${{ github.env.test.vars.PUBLIC_BACKEND_URL }}
+      lane: alpha
+    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 }}
diff --git a/.github/workflows/beta_version.yml b/.github/workflows/beta_version.yml
@@ -1,98 +1,27 @@
-name: 'publish beta'
+name: 🤖🎯 Droid Beta Launchpad
 
 on:
-  workflow_dispatch:
+  push:
+    branches: ['stable']
+
 jobs:
   tests:
-    runs-on: ubuntu-latest
-    environment: test
-    steps:
-      - uses: actions/checkout@v4
-      - uses: dyne/pnpm@main
-        with:
-          node-version: '20.11.1'
-          submodules: true
-      - uses: actions/setup-go@v5
-        with:
-          go-version: '1.22'
-      - uses: supplypike/setup-bin@v4
-        with:
-          uri: https://github.com/dyne/zenroom/releases/latest/download/zencode-exec
-          name: zencode-exec
-          version: latest
-      - run: |
-          git clone --recursive https://github.com/forkbombeu/signroom
-          cd signroom/admin
-          mkdir pb_data
-          cp ../../tests/fixtures/test.db pb_data/data.db
-          rm pb_migrations/1685000000_seed_features.js
-          go build
-          ./pb migrate
-          ./pb serve &
-      - run: npx playwright install --with-deps
-      - run: pnpm test:integration --workers 1
-        env:
-          PUBLIC_BACKEND_URL: http://localhost:8090
-          USER_EMAIL: ${{ vars.USER_EMAIL }}
-          USER_PASSWORD: ${{ vars.USER_PASSWORD }}
-          USER_SEED: ${{ vars.USER_SEED }}
-      - uses: actions/upload-artifact@v4
-        if: ${{ !cancelled() }}
-        with:
-          name: test-results
-          path: test-results/
-          retention-days: 10
+    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:
-    runs-on: ubuntu-latest
+    uses: ./.github/workflows/distribute.yml
     needs: tests
-    steps:
-      - uses: dyne/pnpm@main
-        with:
-          submodules: true
-          node-version: '20.11.1'
-      - uses: actions/cache@v4
-        with:
-          path: |
-            ~/.gradle/caches
-            ~/.gradle/wrapper
-          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
-          restore-keys: |
-            ${{ runner.os }}-gradle-
-      - name: Setup java
-        uses: actions/setup-java@v4
-        with:
-          distribution: zulu
-          java-version: '17'
-      - name: Decode Keystore File
-        uses: timheuer/base64-to-file@v1
-        id: playstore_keystore
-        with:
-          fileName: android_keystore.keystore
-          encodedString: ${{ secrets.BUNDLE_BETA_PLAYSTORE }}
-      - name: Decode Service Account File for Firebase
-        uses: timheuer/base64-to-file@v1
-        id: service_account
-        with:
-          fileName: play-store-credentials.json
-          encodedString: ${{ secrets.FIREBASE_SERVICE_ACCOUNT }}
-      - name: Decode Service Account File for PlayStore
-        uses: timheuer/base64-to-file@v1
-        id: play_console_account
-        with:
-          fileName: play-store-credentials.json
-          encodedString: ${{ secrets.PLAYSTORE_SERVICE_ACCOUNT }}
-      - uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: '3.0'
-          bundler-cache: true
-      - uses: maierj/[email protected]
-        env:
-          KEYSTORE_PATH: ${{ steps.playstore_keystore.outputs.filePath }}
-          SERVICE_ACCOUNT_PATH: ${{ steps.play_console_account.outputs.filePath }}
-          KEYSTORE_KEY_ALIAS: ${{ secrets.BUNDLE_BETA_PLAYSTORE_ALIAS }}
-          KEYSTORE_KEY_PASSWORD: ${{ secrets.BUNDLE_BETA_PASSWORD }}
-          KEYSTORE_STORE_PASSWORD: ${{ secrets.BUNDLE_BETA_PASSWORD }}
-          PUBLIC_BACKEND_URL: ${{ vars.PUBLIC_BACKEND_URL }}
-        with:
-          lane: beta
+    with:
+      backend-url: ${{ vars.PUBLIC_BACKEND_URL }}
+      lane: beta
+    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 }}
diff --git a/.github/workflows/build-upload-ios.yml b/.github/workflows/build-upload-ios.yml
@@ -1,4 +1,4 @@
-name: Build source code on ios
+name: 🍏✨ Flight of the iPhoenix
 
 on:
   pull_request:
@@ -7,6 +7,7 @@ on:
 jobs:
   build_ios:
     runs-on: macOS-latest
+    environment: test
     steps:
       - uses: dyne/pnpm@main
         with:
@@ -44,8 +45,10 @@ jobs:
           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 beta
+          lane: ios testflight
       - name: Upload release bundle
         uses: actions/upload-artifact@v4
         with:

diff --git a/.github/workflows/distribute.yml b/.github/workflows/distribute.yml
@@ -0,0 +1,77 @@
+# .github/workflows/distribute.yml
+name: Reusable Distribute Workflow
+
+on:
+  workflow_call:
+    inputs:
+      backend-url:
+        required: true
+        type: string
+      lane:
+        required: true
+        type: string
+    secrets:
+      keystore-file:
+        required: true
+      service-account:
+        required: true
+      keystore-alias:
+        required: true
+      keystore-key-password:
+        required: true
+      keystore-password:
+        required: true
+      firebase-app-id:
+        required: false
+
+jobs:
+  distribute:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: dyne/pnpm@main
+        with:
+          submodules: true
+          node-version: '20.11.1'
+      - uses: actions/cache@v4
+        with:
+          path: |
+            ~/.gradle/caches
+            ~/.gradle/wrapper
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
+          restore-keys: |
+            ${{ runner.os }}-gradle-
+      - name: Setup java
+        uses: actions/setup-java@v4
+        with:
+          distribution: zulu
+          java-version: '17'
+      - name: Decode Keystore File
+        uses: timheuer/base64-to-file@v1
+        id: keystore
+        with:
+          fileName: keystore.keystore
+          encodedString: ${{ secrets.keystore-file }}
+      - name: Decode Service Account File
+        uses: timheuer/base64-to-file@v1
+        id: service_account
+        with:
+          fileName: service-account.json
+          encodedString: ${{ secrets.service-account }}
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: '3.0'
+          bundler-cache: true
+      - uses: maierj/[email protected]
+        env:
+          KEYSTORE_PATH: ${{ steps.keystore.outputs.filePath }}
+          SERVICE_ACCOUNT_PATH: ${{ steps.service_account.outputs.filePath }}
+          KEYSTORE_KEY_ALIAS: ${{ secrets.keystore-alias }}
+          KEYSTORE_KEY_PASSWORD: ${{ secrets.keystore-key-password }}
+          KEYSTORE_STORE_PASSWORD: ${{ secrets.keystore-password }}
+          PUBLIC_BACKEND_URL: ${{ inputs.backend-url }}
+          PULL_REQUEST_NUMBER: ${{ github.event.number }}
+          PULL_REQUEST_TITLE: ${{ github.event.pull_request.title }}
+          FIREBASE_APP_ID: ${{ secrets.firebase-app-id }}
+
+        with:
+          lane: ${{ inputs.lane }}