Merge branch 'master' into 2573-upgrade-gtmappauth-to-v4

FlowCrypt · Nov 3, 2024 · b4458bd · b4458bd
2 parents f4fba1a + e03d802
commit b4458bd
Show file tree

Hide file tree

Showing 19 changed files with 650 additions and 423 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -5,37 +5,37 @@
 
 version: 2
 updates:
-  - package-ecosystem: "npm"
-    directory: "/"
-    schedule:
-      interval: "monthly"
-    open-pull-requests-limit: 2
-    groups:
-      npm-deps:
-        patterns:
-          - "*"
-    ignore:
-      - dependency-name: "kill-port"
-        versions: ["2.0.0", "2.0.1"]
-      - dependency-name: "eslint"
-        update-types: ["version-update:semver-major"]
+  # - package-ecosystem: "npm"
+  #   directory: "/"
+  #   schedule:
+  #     interval: "monthly"
+  #   open-pull-requests-limit: 2
+  #   groups:
+  #     npm-deps:
+  #       patterns:
+  #         - "*"
+  #   ignore:
+  #     - dependency-name: "kill-port"
+  #       versions: ["2.0.0", "2.0.1"]
+  #     - dependency-name: "eslint"
+  #       update-types: ["version-update:semver-major"]
 
-  - package-ecosystem: "npm"
-    directory: "/Core/"
-    schedule:
-      interval: "monthly"
-    open-pull-requests-limit: 2
-    groups:
-      core-deps:
-        patterns:
-          - "*"
-    ignore:
-      - dependency-name: "@openpgp/web-stream-tools"
-        versions: [">= 0.0.12"]
-      - dependency-name: "ava"
-        update-types: ["version-update:semver-major"]
-      - dependency-name: "chai"
-        update-types: ["version-update:semver-major"]
+  # - package-ecosystem: "npm"
+  #   directory: "/Core/"
+  #   schedule:
+  #     interval: "monthly"
+  #   open-pull-requests-limit: 2
+  #   groups:
+  #     core-deps:
+  #       patterns:
+  #         - "*"
+  #   ignore:
+  #     - dependency-name: "@openpgp/web-stream-tools"
+  #       versions: [">= 0.0.12"]
+  #     - dependency-name: "ava"
+  #       update-types: ["version-update:semver-major"]
+  #     - dependency-name: "chai"
+  #       update-types: ["version-update:semver-major"]
 
   - package-ecosystem: "github-actions"
     directory: "/"
@@ -46,12 +46,12 @@ updates:
         patterns:
           - "*"
 
-  - package-ecosystem: "npm"
-    directory: "/appium/"
-    schedule:
-      interval: "monthly"
-    open-pull-requests-limit: 2
-    groups:
-      appium-deps:
-        patterns:
-          - "*"
+  # - package-ecosystem: "npm"
+  #   directory: "/appium/"
+  #   schedule:
+  #     interval: "monthly"
+  #   open-pull-requests-limit: 2
+  #   groups:
+  #     appium-deps:
+  #       patterns:
+  #         - "*"
diff --git a/.semaphore/semaphore.yml b/.semaphore/semaphore.yml
@@ -13,9 +13,9 @@ blocks:
   - name: Build + Swift Unit Test
     dependencies: []
     run:
-      when: "change_in('/', {exclude: ['/Core/package.json', '/Core/package-lock.json']})"
+      when: "change_in('/', {exclude: ['/Core/package.json', '/Core/package-lock.json', '/.github/dependabot.yml']})"
     execution_time_limit:
-      minutes: 115
+      minutes: 60
     task:
       env_vars:
         - name: LANG
@@ -28,18 +28,19 @@ blocks:
       jobs:
         - name: Build Xcode Project + Swift Unit Test
           commands:
-            - fastlane build
-            - fastlane test
+            - bundle install
+            - bundle exec fastlane build
+            - bundle exec fastlane test
       epilogue:
         always:
           commands:
             - cd /var/tmp/derived_data/Build/Products/Debug-iphonesimulator && cache store FlowCrypt-$SEMAPHORE_GIT_SHA.app FlowCrypt.app
   - name: TypeScript tests
     dependencies: []
     run:
-      when: "change_in('/', {exclude: ['/appium/package.json', '/appium/package-lock.json']})"
+      when: "change_in('/', {exclude: ['/appium/package.json', '/appium/package-lock.json', '/.github/dependabot.yml']})"
     execution_time_limit:
-      minutes: 45
+      minutes: 5
     task:
       agent:
         machine:
@@ -67,6 +68,10 @@ blocks:
   - name: UI Tests
     dependencies:
       - Build + Swift Unit Test
+    run:
+      when: "change_in('/', {exclude: ['/Core/package.json', '/Core/package-lock.json', '/Gemfile', '/Gemfile.lock', '/.github/dependabot.yml', '/.semaphore/semaphore.yml', '/package.json', '/package-lock.json']})"
+    execution_time_limit:
+      minutes: 80
     task:
       env_vars:
         - name: LANG
@@ -104,8 +109,6 @@ blocks:
             # - npm run-script test.live.all
       secrets:
         - name: flowcrypt-ios-ci-secrets
-    run:
-      when: "change_in('/', {exclude: ['/Core/package.json', '/Core/package-lock.json']})"
 after_pipeline:
   task:
     jobs: