From fd3d8c46a001af8f6a34c034f7dac3bcc4fb0c6d Mon Sep 17 00:00:00 2001
From: Lorenzo Mattei <lore.mattei@gmail.com>
Date: Wed, 27 Nov 2024 12:13:46 +0100
Subject: [PATCH 1/2] Move Maestro test to Robin

---
 .github/workflows/end-to-end.yml      | 4 ++--
 .github/workflows/sync-end-to-end.yml | 2 +-
 .maestro/setup_ui_tests.sh            | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/end-to-end.yml b/.github/workflows/end-to-end.yml
index 20ed48ea18..3e321dd016 100644
--- a/.github/workflows/end-to-end.yml
+++ b/.github/workflows/end-to-end.yml
@@ -93,8 +93,8 @@ jobs:
 
     - name: End to End tests
       run: |
-        export PATH="$PATH":"$HOME/.maestro/bin"; maestro cloud --apiKey ${{ secrets.MAESTRO_CLOUD_API_KEY }} -e ONBOARDING_COMPLETED=true --fail-on-timeout=true --fail-on-cancellation=true --timeout=150 --ios-version=17 --include-tags=${{ matrix.test-tag }} DerivedData/Build/Products/Debug-iphonesimulator/DuckDuckGo.app .maestro/
-      
+        export PATH="$PATH":"$HOME/.maestro/bin"; maestro cloud --apiKey ${{ secrets.ROBIN_API_KEY }} --project-id ${{ secrets.ROBIN_PROJECT_KEY }} -e ONBOARDING_COMPLETED=true --fail-on-timeout=true --fail-on-cancellation=true --timeout=150 --ios-version=17 --include-tags=${{ matrix.test-tag }} DerivedData/Build/Products/Debug-iphonesimulator/DuckDuckGo.app .maestro/
+  
   # notify-failure:
   #   name: Notify on failure
   #   if: ${{ always() && contains(join(needs.*.result, ','), 'failure') && github.ref_name == 'main' }}
diff --git a/.github/workflows/sync-end-to-end.yml b/.github/workflows/sync-end-to-end.yml
index e96a5769ef..7af7668ead 100644
--- a/.github/workflows/sync-end-to-end.yml
+++ b/.github/workflows/sync-end-to-end.yml
@@ -102,7 +102,7 @@ jobs:
         
     - name: Sync e2e tests 
       run: |
-        export PATH="$PATH":"$HOME/.maestro/bin"; maestro cloud --apiKey ${{ secrets.MAESTRO_CLOUD_API_KEY }} -e ONBOARDING_COMPLETED=true --env=CODE=${{ steps.sync-recovery-code.outputs.recovery-code }} --fail-on-timeout=true --fail-on-cancellation=true --timeout=150 --ios-version=${{ matrix.os-version }} --include-tags=sync DerivedData/Build/Products/Debug-iphonesimulator/DuckDuckGo.app .maestro/
+        export PATH="$PATH":"$HOME/.maestro/bin"; maestro cloud --apiKey ${{ secrets.ROBIN_API_KEY }} --project-id ${{ secrets.ROBIN_PROJECT_KEY }} -e ONBOARDING_COMPLETED=true --env=CODE=${{ steps.sync-recovery-code.outputs.recovery-code }} --fail-on-timeout=true --fail-on-cancellation=true --timeout=150 --ios-version=${{ matrix.os-version }} --include-tags=sync --app-file DerivedData/Build/Products/Debug-iphonesimulator/DuckDuckGo.app --flows .maestro/
 
     - name: Reset config
       run: |
diff --git a/.maestro/setup_ui_tests.sh b/.maestro/setup_ui_tests.sh
index d47d106b1a..2e2c0d3014 100755
--- a/.maestro/setup_ui_tests.sh
+++ b/.maestro/setup_ui_tests.sh
@@ -15,7 +15,7 @@ target_os="iOS-18-1"
 check_maestro() {
 
     local command_name="maestro"
-    local known_version="1.36.0"
+    local known_version="1.39.1"
 
     if command -v $command_name > /dev/null 2>&1; then
       local version_output=$($command_name -v 2>&1 | tail -n 1)

From a00a83dfafab995e8dfe318096ffbfca05dee871 Mon Sep 17 00:00:00 2001
From: Lorenzo Mattei <lore.mattei@gmail.com>
Date: Wed, 27 Nov 2024 12:21:31 +0100
Subject: [PATCH 2/2] Update Maestro to 1.39.1

---
 .github/workflows/end-to-end.yml      | 2 +-
 .github/workflows/sync-end-to-end.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/end-to-end.yml b/.github/workflows/end-to-end.yml
index 3e321dd016..05b27809a3 100644
--- a/.github/workflows/end-to-end.yml
+++ b/.github/workflows/end-to-end.yml
@@ -89,7 +89,7 @@ jobs:
 
     - name: Install Maestro
       run: |
-        export MAESTRO_VERSION=1.36.0; curl -Ls "https://get.maestro.mobile.dev" | bash
+        export MAESTRO_VERSION=1.39.1; curl -Ls "https://get.maestro.mobile.dev" | bash
 
     - name: End to End tests
       run: |
diff --git a/.github/workflows/sync-end-to-end.yml b/.github/workflows/sync-end-to-end.yml
index 7af7668ead..b6ea062cab 100644
--- a/.github/workflows/sync-end-to-end.yml
+++ b/.github/workflows/sync-end-to-end.yml
@@ -94,7 +94,7 @@ jobs:
 
     - name: Install Maestro
       run: |
-        export MAESTRO_VERSION=1.36.0; curl -Ls "https://get.maestro.mobile.dev" | bash
+        export MAESTRO_VERSION=1.39.1; curl -Ls "https://get.maestro.mobile.dev" | bash
         
     - name: Overwrite default config with sync one
       run: |