Merge branch 'mobile/releasable' into fix/deeplinking

TryQuiet · Oct 9, 2023 · 3292d36 · 3292d36
2 parents 22909d2 + 94855a8
commit 3292d36
Show file tree

Hide file tree

Showing 9 changed files with 79 additions and 7 deletions.
diff --git a/.github/workflows/desktop-build.yml b/.github/workflows/desktop-build.yml
@@ -6,11 +6,20 @@ on:
       [released, prereleased]
 
 jobs:
+
   run-e2e-tests-linux:
+    if: |
+      startsWith(github.ref, 'refs/tags/@quiet/desktop')
     uses: ./.github/workflows/e2e-linux.yml
+
   run-e2e-tests-mac:
+    if: |
+      startsWith(github.ref, 'refs/tags/@quiet/desktop')
     uses: ./.github/workflows/e2e-mac.yml
+
   run-e2e-tests-win:
+    if: |
+      startsWith(github.ref, 'refs/tags/@quiet/desktop')
     uses: ./.github/workflows/e2e-win.yml
 
   build-linux:

diff --git a/.github/workflows/e2e-ios.yml b/.github/workflows/e2e-ios.yml
@@ -0,0 +1,39 @@
+name: E2E iOS
+
+on:
+  pull_request:
+    paths:
+      - packages/mobile/**
+
+jobs:
+  detox:
+    timeout-minutes: 10
+    runs-on: [self-hosted, macOS, ARM64]
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Install dependencies
+        run: |
+          npm i
+          npm run lerna bootstrap --scope @quiet/eslint-config,@quiet/logger,@quiet/common,@quiet/types,@quiet/state-manager,@quiet/backend,@quiet/identity,@quiet/mobile,backend-bundle
+
+      - name: Pull binaries
+        run: |
+          git lfs install
+          git lfs pull
+
+      - name: Install pods
+        run: |
+          cd packages/mobile/ios
+          pod install
+
+      - name: Build Detox
+        run: |
+          cd packages/mobile
+          detox build -c ios.sim.debug.ci
+
+      - name: Run basic tests
+        run: |
+          cd packages/mobile
+          detox test starter -c ios.sim.debug.ci
diff --git a/packages/mobile/.detoxrc.js b/packages/mobile/.detoxrc.js
@@ -56,6 +56,12 @@ module.exports = {
         type: 'iPhone 14',
       },
     },
+    simulator_ci: {
+      type: 'ios.simulator',
+      device: {
+        type: 'iPhone 15'
+      }
+    },
     attached: {
       type: 'android.attached',
       device: {
@@ -80,6 +86,16 @@ module.exports = {
         },
       },
     },
+    'ios.sim.debug.ci': {
+      device: 'simulator_ci',
+      app: 'ios.debug',
+      artifacts: {
+        rootDir: './e2e/artifacts/ios',
+        plugins: {
+          instruments: 'all',
+        },
+      },
+    },
     'ios.sim.storybook': {
       device: 'simulator',
       app: 'ios.storybook',

diff --git a/packages/mobile/CHANGELOG.md b/packages/mobile/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [2.0.0-alpha.20](https://github.com/ZbayApp/monorepo/compare/@quiet/[email protected]...@quiet/[email protected]) (2023-10-05)
+
+**Note:** Version bump only for package @quiet/mobile
+
+
+
+
+
 # [2.0.0-alpha.19](https://github.com/ZbayApp/monorepo/compare/@quiet/[email protected]...@quiet/[email protected]) (2023-10-04)
 
 **Note:** Version bump only for package @quiet/mobile

diff --git a/packages/mobile/android/app/build.gradle b/packages/mobile/android/app/build.gradle
@@ -166,8 +166,8 @@ android {
         applicationId "com.quietmobile"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 337
-        versionName "2.0.0-alpha.19"
+        versionCode 338
+        versionName "2.0.0-alpha.20"
         resValue "string", "build_config_package", "com.quietmobile"
         testBuildType System.getProperty('testBuildType', 'debug')
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'

diff --git a/packages/mobile/ios/Quiet/Info.plist b/packages/mobile/ios/Quiet/Info.plist
@@ -34,7 +34,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>317</string>
+	<string>318</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false />
 	<key>LSRequiresIPhoneOS</key>

diff --git a/packages/mobile/ios/QuietTests/Info.plist b/packages/mobile/ios/QuietTests/Info.plist
@@ -19,6 +19,6 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>317</string>
+	<string>318</string>
 </dict>
 </plist>
diff --git a/packages/mobile/package-lock.json b/packages/mobile/package-lock.json
diff --git a/packages/mobile/package.json b/packages/mobile/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@quiet/mobile",
-  "version": "2.0.0-alpha.19",
+  "version": "2.0.0-alpha.20",
   "scripts": {
     "build": "tsc -p tsconfig.build.json --noEmit",
     "storybook-android": "ENVFILE=.env.storybook react-native run-android --variant=storybookDebug --appIdSuffix=storybook.debug",