Conection reset

.circleci/config.yml

@@ -7,7 +7,7 @@ parameters:
     type: boolean
     default: false   
 orbs:
-  browser-tools: circleci/[email protected].2
+  browser-tools: circleci/[email protected].3
   win: circleci/[email protected]
   node: circleci/[email protected]
 jobs:
@@ -125,6 +125,9 @@ jobs:
         - node/install:
             install-yarn: true
             node-version: '20.2'
+        - restore_cache:
+            keys:
+              - remixdesktop-linux-deps-{{ checksum "apps/remixdesktop/yarn.lock" }}
         - run: 
             command: |
                 node -v
@@ -134,10 +137,14 @@ jobs:
                 mkdir apps/remixdesktop/build
                 cp -r dist/apps/remix-ide apps/remixdesktop/build
                 cd apps/remixdesktop/
-                yarn add node-pty
-                yarn --ignore-optional
-                yarn add @remix-project/remix-ws-templates
+                yarn add node-pty --network-timeout 600000
+                yarn --ignore-optional --network-timeout 600000
+                yarn add @remix-project/remix-ws-templates --network-timeout 600000
                 ./rundist.bash test_only
+        - save_cache:
+            key: remixdesktop-linux-deps-{{ checksum "apps/remixdesktop/yarn.lock" }}
+            paths:
+              - apps/remixdesktop/node_modules
         - run:  
             name: "Run tests"
             command: |
@@ -152,6 +159,9 @@ jobs:
             path: ./apps/remixdesktop/reports/tests
         - store_artifacts:
             path: ./apps/remixdesktop/reports/screenshots
+        - store_artifacts:
+            path: /home/circleci/remix-project/logs
+            destination: logs
 
   build-remixdesktop-linux:
       machine:
@@ -310,6 +320,9 @@ jobs:
           path: ./apps/remixdesktop/reports/tests
       - store_artifacts:
           path: ./apps/remixdesktop/reports/screenshots
+      - store_artifacts:
+            path: /home/circleci/remix-project/logs
+            destination: logs
 
   # to setup a new certificate:
   # 1) from https://one.digicert.com/signingmanager/dashboard in the 'get started' section, the following configuration variables can be created:
@@ -581,6 +594,9 @@ jobs:
           path: ./apps/remixdesktop/reports/tests
       - store_artifacts:
           path: ./apps/remixdesktop/reports/screenshots
+      - store_artifacts:
+            path: /home/circleci/remix-project/logs
+            destination: logs
 
   uploadartifacts:
     docker:
@@ -662,6 +678,11 @@ jobs:
         default: 1
     parallelism: << parameters.parallelism >>
     steps:
+      - run:
+          name: set env
+          command: |
+            export DBUS_SESSION_BUS_ADDRESS=/dev/null
+            export XDG_RUNTIME_DIR=/tmp
       - checkout
       - attach_workspace:
           at: .
@@ -679,21 +700,25 @@ jobs:
             - browser-tools/install-browser-tools:
                 install-firefox: false
                 install-chrome: true
-                install-chromedriver: false
+                install-chromedriver: true
                 install-geckodriver: false
-            - run: yarn install_webdriver
-            - run: google-chrome --version
       - when:
           condition:
               equal: [ "chromeMetamask", << parameters.browser >> ]
           steps:
+            - run:
+                name: Set metamask test flag
+                command: echo "METAMASK_TEST=true" >> $BASH_ENV
             - browser-tools/install-browser-tools:
                 install-firefox: false
                 install-chrome: true
-                install-chromedriver: false
+                install-chromedriver: true
                 install-geckodriver: false
-            - run: yarn install_webdriver
-            - run: google-chrome --version
+            #- run: yarn install_webdriver
+            - run:
+                command: |
+                  google-chrome --version
+                  chromedriver --version
       - when:
           condition:
               equal: [ "firefox", << parameters.browser >> ]
@@ -710,6 +735,9 @@ jobs:
           path: ./reports/tests
       - store_artifacts:
           path: ./reports/screenshots
+      - store_artifacts:
+          path: /home/circleci/remix-project/logs
+          destination: logs
 
   tests-passed:
     machine:
@@ -743,14 +771,20 @@ jobs:
           install-firefox: false
           install-chrome: true
           install-geckodriver: false
-          install-chromedriver: false
-      - run: yarn install_webdriver
-      - run: google-chrome --version
+          install-chromedriver: true
+      #- run: yarn install_webdriver
+      - run:
+          command: |
+            google-chrome --version
+            chromedriver --version
       - run: ./apps/remix-ide/ci/browser_test_plugin.sh << parameters.plugin >>
       - store_test_results:
           path: ./reports/tests
       - store_artifacts:
           path: ./reports/screenshots
+      - store_artifacts:
+          path: /home/circleci/remix-project/logs
+          destination: logs
 
 
   predeploy:
@@ -812,7 +846,7 @@ workflows:
               script: ["flaky.sh"]
               job: ["nogroup"]
               jobsize: ["1"]
-              parallelism: [5]
+              parallelism: [10]
   run_metamask_tests:
     when: << pipeline.parameters.run_metamask_tests >>
     jobs:
@@ -868,6 +902,9 @@ workflows:
       - test-remixdesktop-linux:
           requires:
             - build-desktop
+          filters:
+            branches:
+              only: [/.*desktop.*/]
       - test-remixdesktop-windows:
           requires:
            - build-desktop
@@ -915,8 +952,8 @@ workflows:
             parameters:
               browser: ["chrome", "firefox"]
               script: ["browser_test.sh"]
-              job: ["0","1","2","3","4","5","6","7","8","9"]
-              jobsize: ["10"]
+              job: ["0","1","2","3","4","5","6","7","8","9","10","11","12","13","14"]
+              jobsize: ["15"]
               parallelism: [15]
       - remix-ide-browser:
           requires:

apps/remix-ide-e2e/chrome-driver.sh

@@ -0,0 +1,93 @@
+#!/usr/bin/env bash
+# Usage: chrome-driver.sh [install_dir]
+# Determine install directory from first argument or ORB_PARAM_DRIVER_INSTALL_DIR
+INSTALL_DIR=${1:-${ORB_PARAM_DRIVER_INSTALL_DIR:-"./tmp/webdrivers"}}
+echo "Installing ChromeDriver into $INSTALL_DIR"
+
+# Determine the OS platform
+OS="$(uname)"
+
+if [ "$OS" == "Darwin" ]; then
+  # macOS systems
+  if [ -e "/Applications/Google Chrome.app/Contents/MacOS/Google Chrome" ]; then
+    version=$("/Applications/Google Chrome.app/Contents/MacOS/Google Chrome" --version)
+    echo "Google Chrome version on macOS: $version"
+  else
+    echo "Google Chrome is not installed on your macOS."
+  fi
+elif [ "$OS" == "Linux" ]; then
+  # Linux systems
+  if command -v google-chrome >/dev/null; then
+    version=$(google-chrome --version)
+    echo "Google Chrome version on Linux: $version"
+  else
+    echo "Google Chrome is not installed on your Linux."
+    # exit without error
+    exit 0
+  fi
+else
+  echo "Unsupported OS."
+  exit 0
+fi
+
+MAJORVERSION='135' # $(echo "$version" | grep -Eo '[0-9]+\.' | head -1 | cut -d'.' -f1)
+echo "CHROME DRIVER INSTALL $MAJORVERSION"
+
+# Determine target platform for ChromeDriver download
+case "$OS" in
+  Darwin)
+    if [[ "$(uname -m)" == "arm64" ]]; then
+      PLATFORM="mac-arm64"
+    else
+      PLATFORM="mac-x64"
+    fi
+    ;;
+  Linux)
+    PLATFORM="linux64"
+    ;;
+  *)
+    echo "Unsupported OS: $OS"; exit 1
+    ;;
+esac
+echo "Detected platform for download: $PLATFORM"
+
+# Determine ChromeDriver version and download URL
+if [ "$MAJORVERSION" -lt 115 ]; then
+  # Chrome <115: use storage.googleapis.com
+  CHROMEDRIVER_VERSION=$(curl -sS "https://chromedriver.storage.googleapis.com/LATEST_RELEASE_${MAJORVERSION}" | tr -d '\r')
+  CHROMEDRIVER_DOWNLOAD_URL="https://chromedriver.storage.googleapis.com/${CHROMEDRIVER_VERSION}/chromedriver_${PLATFORM}.zip"
+else
+  # Chrome >=115: use Chrome for Testing JSON feed
+  FEED_URL="https://googlechromelabs.github.io/chrome-for-testing/latest-versions-per-milestone-with-downloads.json"
+  CHROMEDRIVER_VERSION=$(curl -sS "$FEED_URL" | jq -r ".milestones.\"$MAJORVERSION\".version")
+  CHROMEDRIVER_DOWNLOAD_URL=$(curl -sS "$FEED_URL" \
+    | jq -r ".milestones.\"$MAJORVERSION\".downloads.chromedriver[] \
+      | select(.platform==\"$PLATFORM\").url")
+fi
+
+echo "Matching ChromeDriver version: $CHROMEDRIVER_VERSION"
+echo "Downloading ChromeDriver from $CHROMEDRIVER_DOWNLOAD_URL"
+
+# Prepare install directory
+mkdir -p "$INSTALL_DIR"
+
+# Download and install ChromeDriver
+ZIP_PATH="${INSTALL_DIR}/chromedriver_${PLATFORM}.zip"
+curl -sS -o "$ZIP_PATH" "$CHROMEDRIVER_DOWNLOAD_URL"
+unzip -o "$ZIP_PATH" -d "$INSTALL_DIR"
+
+# Move the extracted chromedriver binary to the root of INSTALL_DIR
+EXTRACTED_DIR=$(find "$INSTALL_DIR" -mindepth 1 -maxdepth 1 -type d | head -n1)
+if [ -f "$EXTRACTED_DIR/chromedriver" ]; then
+  mv "$EXTRACTED_DIR/chromedriver" "$INSTALL_DIR/chromedriver"
+else
+  echo "Error: chromedriver binary not found in $EXTRACTED_DIR"
+  exit 1
+fi
+
+chmod +x "$INSTALL_DIR/chromedriver"
+# Cleanup extracted directory and zip
+rm -rf "$EXTRACTED_DIR"
+rm -f "$ZIP_PATH"
+
+echo "ChromeDriver installed at $INSTALL_DIR/chromedriver"

apps/remix-ide-e2e/install-webdriver.sh

@@ -1,31 +1,7 @@
 #!/bin/bash
 
-# Determine the OS platform
-OS="$(uname)"
-
-if [ "$OS" == "Darwin" ]; then
-  # macOS systems
-  if [ -e "/Applications/Google Chrome.app/Contents/MacOS/Google Chrome" ]; then
-    version=$("/Applications/Google Chrome.app/Contents/MacOS/Google Chrome" --version)
-    echo "Google Chrome version on macOS: $version"
-  else
-    echo "Google Chrome is not installed on your macOS."
-  fi
-elif [ "$OS" == "Linux" ]; then
-  # Linux systems
-  if command -v google-chrome >/dev/null; then
-    version=$(google-chrome --version)
-    echo "Google Chrome version on Linux: $version"
-  else
-    echo "Google Chrome is not installed on your Linux."
-  fi
-else
-  echo "Unsupported OS."
-fi
-
-MAJORVERSION=$(echo "$version" | grep -Eo '[0-9]+\.' | head -1 | cut -d'.' -f1)
-echo "CHROME DRIVER INSTALL $MAJORVERSION"
-
+set -e
+./apps/remix-ide-e2e/chrome-driver.sh
 # Specify the directory to check
 directory="./tmp/webdrivers"
 
@@ -39,4 +15,4 @@ fi
 
 
 yarn init -y --cwd "$directory" || exit 1
-yarn add -D chromedriver@$MAJORVERSION geckodriver --cwd  "$directory" ||  yarn add -D chromedriver@$MAJORVERSION geckodriver --cwd  "$directory" || yarn add -D chromedriver geckodriver --cwd  "$directory" || exit 1
+yarn add -D geckodriver --cwd  "$directory" ||  yarn add -D geckodriver --cwd  "$directory" || yarn add -D chromedriver geckodriver --cwd  "$directory" || exit 1