From 8bfbcb6b8746601eb96fcd1d6db7ce7bdd3076fc Mon Sep 17 00:00:00 2001
From: Heinrich Apfelmus <apfelmus@quantentunnel.de>
Date: Tue, 2 Jul 2024 17:16:09 +0200
Subject: [PATCH 1/2] Use Ruby setup based on `Gemfile` in E2E Windows

---
 .github/workflows/e2e-windows.yml | 20 ++++++++------------
 test/e2e/Gemfile.lock             |  2 +-
 2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/e2e-windows.yml b/.github/workflows/e2e-windows.yml
index 1679d48e750..cb39df24985 100644
--- a/.github/workflows/e2e-windows.yml
+++ b/.github/workflows/e2e-windows.yml
@@ -23,7 +23,6 @@ jobs:
       BRANCH: ${{ github.event.inputs.branch || 'rc-latest' }}
       TAGS: ${{ github.event.inputs.tags || 'all' }}
 
-
     steps:
     - name: Check space
       run: Get-PSDrive
@@ -46,6 +45,7 @@ jobs:
       with:
         ruby-version: 2.7.1
         bundler-cache: true
+        working-directory: C:/cardano-wallet/test/e2e
 
     - name: Install dependencies
       working-directory: C:/cardano-wallet/test/e2e
@@ -58,13 +58,9 @@ jobs:
         choco install nssm
         choco install archiver
 
-
     - name: 🕒 Get Date/Time
       working-directory: C:/cardano-wallet/test/e2e
-      id: date-time
-      shell: bash
-      run: |
-        echo "value=$(rake datetime)" >> $GITHUB_OUTPUT
+      run: bundle exec rake datetime
 
     - name: 💾 GH Cache node db
       id: cache-node
@@ -90,27 +86,27 @@ jobs:
 
     - name: ⚙️ Setup (get latest bins and configs and decode fixtures)
       working-directory: C:/cardano-wallet/test/e2e
-      run: rake setup[preprod,%BRANCH%]
+      run: bundle exec rake setup[preprod,%BRANCH%]
 
     - name: 🔍 Display versions
       working-directory: C:/cardano-wallet/test/e2e
-      run: rake display_versions
+      run: bundle exec rake display_versions
 
     - name: 🚀 Start node and wallet
       working-directory: C:/cardano-wallet/test/e2e
-      run: rake start_node_and_wallet[preprod]
+      run: bundle exec rake start_node_and_wallet[preprod]
 
     - name: ⏳ Wait until node is synced
       working-directory: C:/cardano-wallet/test/e2e
-      run: rake wait_until_node_synced
+      run: bundle exec rake wait_until_node_synced
 
     - name: 🧪 Run all tests
       working-directory: C:/cardano-wallet/test/e2e
-      run: rake spec SPEC_OPTS="-t %TAGS%"
+      run: bundle exec rake spec SPEC_OPTS="-t %TAGS%"
 
     - name: 🏁 Stop node and wallet
       working-directory: C:/cardano-wallet/test/e2e
-      run: rake stop_node_and_wallet[preprod]
+      run: bundle exec rake stop_node_and_wallet[preprod]
 
     - name: 💾 GH Save Cache of node db
       if: always()
diff --git a/test/e2e/Gemfile.lock b/test/e2e/Gemfile.lock
index 8a5d5915518..18bfb1b8c2b 100644
--- a/test/e2e/Gemfile.lock
+++ b/test/e2e/Gemfile.lock
@@ -55,4 +55,4 @@ DEPENDENCIES
   rspec (= 3.11.0)
 
 BUNDLED WITH
-   2.1.4
+   2.4.22

From 190b8299b75b7093add200199cf70221683eb98a Mon Sep 17 00:00:00 2001
From: Heinrich Apfelmus <apfelmus@quantentunnel.de>
Date: Wed, 3 Jul 2024 13:34:19 +0200
Subject: [PATCH 2/2] Increase timeout of `wait_until_node_synced`

---
 test/e2e/Rakefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/e2e/Rakefile b/test/e2e/Rakefile
index 25769454b0a..6e0b376af5e 100644
--- a/test/e2e/Rakefile
+++ b/test/e2e/Rakefile
@@ -117,7 +117,7 @@ task :wait_until_node_synced do
 
   network = CardanoWallet.new.misc.network
   # allow 180 mins for connecting to the node in case it needs to replay ledger
-  timeout = 300
+  timeout = 180*60
   current_time = Time.now
   timeout_treshold = current_time + timeout
   log "Timeout: #{timeout}s"