Merge branch 'master' into http-proxy-support

.github/workflows/example-tests.yml

@@ -10,7 +10,6 @@ on:
 
 jobs:
   example:
-    runs-on: ubuntu-24.04
     strategy:
       fail-fast: false
       matrix:
@@ -22,6 +21,14 @@ jobs:
           firefox-esr,
           included-as-non-root
           ]
+        os: [
+          ubuntu-24.04,     # testing Linux/amd64 platform
+          ubuntu-24.04-arm  # testing Linux/arm64 platform
+          ]
+        exclude:
+          - os: ubuntu-24.04-arm
+            directory: chrome-for-testing #browser not available for Linux/arm64
+    runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v4
       - name: Run test script

base-internal/releases/node-20/20.18.1-bullseye/Dockerfile

@@ -38,6 +38,44 @@ RUN apt-get update && \
   && rm -rf /var/lib/apt/lists/* \
   && apt-get clean
 
+USER root
+
+RUN node --version
+
+# Install dependencies
+RUN apt-get update && \
+  apt-get install -y \
+  fonts-liberation \
+  git \
+  libcurl4 \
+  libcurl3-gnutls \
+  libcurl3-nss \
+  libvulkan1 \
+  xdg-utils \
+  wget \
+  # needed for circle orb browsers to install firefox
+  gpg \
+  # needed for circle orb browsers to install chromedriver
+  jq \
+  curl \
+  # chrome dependencies
+  libu2f-udev \
+  # firefox dependencies
+  bzip2 \
+  # add codecs needed for video playback in firefox
+  # https://github.com/cypress-io/cypress-docker-images/issues/150
+  mplayer \
+  \
+  # clean up
+  && rm -rf /var/lib/apt/lists/* \
+  && apt-get clean
+
+# install libappindicator3-1 - not included with Debian 11
+RUN wget --no-verbose /usr/src/libappindicator3-1_0.4.92-7_amd64.deb "http://ftp.us.debian.org/debian/pool/main/liba/libappindicator/libappindicator3-1_0.4.92-7_amd64.deb" && \
+  dpkg -i /usr/src/libappindicator3-1_0.4.92-7_amd64.deb ; \
+  apt-get install -f -y && \
+  rm -f /usr/src/libappindicator3-1_0.4.92-7_amd64.deb
+
 # a few environment variables to make NPM installs easier
 # good colors for most applications
 ENV TERM=xterm

examples/basic-mini/scripts/test.sh

@@ -1,8 +1,25 @@
 #!/bin/bash
 set -e # fail on error
 #
-# Run in examples/basic-mini directory
-# (amd64 only)
+# Run ./scripts/test.sh in examples/basic-mini directory
 #
-echo Test base-mini with cypress/included in Chrome
-docker run --rm -v .:/app -w /app --entrypoint cypress cypress/included run -b chrome
+ARCHITECTURE=$(uname -m)
+echo Running on $ARCHITECTURE
+
+echo Test basic-mini example
+
+case $ARCHITECTURE in
+  x86_64)
+    echo Testing cypress/included in amd64 using Chrome
+      docker run --rm -v .:/app -w /app --entrypoint cypress cypress/included run -b chrome
+    ;;
+  aarch64)
+    echo Testing cypress/included in arm64 using Electron
+    echo No other browsers available
+      docker run --rm -v .:/app -w /app cypress/included
+    ;;
+  *)
+    echo Unsupported architecture
+    exit 1
+    ;;
+esac

examples/basic/package.json

@@ -7,6 +7,6 @@
   },
   "private": true,
   "devDependencies": {
-    "cypress": "^13.17.0"
+    "cypress": "^14.0.0"
   }
 }

examples/basic/scripts/test.sh

@@ -1,14 +1,30 @@
 #!/bin/bash
 set -e # fail on error
 #
-# Run in examples/basic directory
-# (amd64 only)
+# Run ./scripts/test.sh in examples/basic directory
 #
+ARCHITECTURE=$(uname -m)
+echo Running on $ARCHITECTURE
+
 echo Test basic example
-npm ci                    # Install dependencies
+npm ci # Install dependencies
 echo Build and test with cypress/base in Electron
 docker build -f Dockerfile.base -t test-base  . # Build a new image
 docker run --rm --entrypoint bash test-base -c "npx cypress run" # Run Cypress test in container
-echo Build and test with cypress/browsers in Chrome
-docker build -f Dockerfile.browsers -t test-browsers . # Build a new image
-docker run --rm --entrypoint bash test-browsers -c "npx cypress run -b chrome" # Run Cypress test in container using Chrome
+
+case $ARCHITECTURE in
+  x86_64)
+    echo Testing browsers in amd64
+    echo Build and test with cypress/browsers in Chrome
+      docker build -f Dockerfile.browsers -t test-browsers . # Build a new image
+      docker run --rm --entrypoint bash test-browsers -c "npx cypress run -b chrome" # Run Cypress test in container using Chrome
+    ;;
+  aarch64)
+    echo Skipping browser tests for arm64
+    echo No browsers available
+    ;;
+  *)
+    echo Unsupported architecture
+    exit 1
+    ;;
+esac

examples/chrome-for-testing/package.json

@@ -10,6 +10,6 @@
   "private": true,
   "devDependencies": {
     "@puppeteer/browsers": "^2.6.1",
-    "cypress": "^13.17.0"
+    "cypress": "^14.0.0"
   }
 }

examples/chrome-for-testing/scripts/test.sh

@@ -3,24 +3,40 @@ set -e # fail on error
 #
 # Test building and running custom Cypress Docker image with different
 # versions of Chrome for Testing
-# Run in directory examples/chrome-for-testing
-# (amd64 only)
 #
-npm ci # Install dependencies
+# Run ./scripts/test.sh in directory examples/chrome-for-testing
 #
-chromeVersion=(
-    'stable'
-    'beta'
-    'dev'
-    'canary'
-    '130'
-    '131.0.6778.204'
-    )
-# Build, show Cypress info and run Cypress test
-for i in ${!chromeVersion[@]}; do
-echo
-echo CHROME_VERSION ${chromeVersion[$i]}
-docker build --build-arg CHROME_VERSION=${chromeVersion[$i]} -t test-chrome-for-testing .
-docker run --rm --entrypoint bash test-chrome-for-testing -c "npx cypress info"
-docker run --rm --entrypoint bash test-chrome-for-testing -c "npx cypress run --browser chrome-for-testing"
-done
+ARCHITECTURE=$(uname -m)
+echo Running on $ARCHITECTURE
+
+case $ARCHITECTURE in
+  x86_64)
+    echo Testing Chrome for Testing in amd64
+    npm ci # Install dependencies
+    #
+    chromeVersion=(
+        'stable'
+        'beta'
+        'dev'
+        'canary'
+        '130'
+        '131.0.6778.204'
+        )
+    # Build, show Cypress info and run Cypress test
+    for i in ${!chromeVersion[@]}; do
+    echo
+    echo CHROME_VERSION ${chromeVersion[$i]}
+    docker build --build-arg CHROME_VERSION=${chromeVersion[$i]} -t test-chrome-for-testing .
+    docker run --rm --entrypoint bash test-chrome-for-testing -c "npx cypress info"
+    docker run --rm --entrypoint bash test-chrome-for-testing -c "npx cypress run --browser chrome-for-testing"
+    done
+    ;;
+  aarch64)
+    echo Skipping Chrome for Testing for arm64
+    echo This browser is not available for Linux/arm64
+    ;;
+  *)
+    echo Unsupported architecture
+    exit 1
+    ;;
+esac

examples/chromium/package.json

@@ -9,6 +9,6 @@
   },
   "private": true,
   "devDependencies": {
-    "cypress": "^13.17.0"
+    "cypress": "^14.0.0"
   }
 }

examples/chromium/scripts/test.sh

@@ -1,9 +1,25 @@
 #!/bin/bash
 set -e # fail on error
 #
-# Run in examples/chromium directory
+# Run ./scripts/test.sh in examples/chromium directory
 #
+ARCHITECTURE=$(uname -m)
+echo Running on $ARCHITECTURE
+
+case $ARCHITECTURE in
+  x86_64)
+    echo Testing Chromium browser in amd64
+    ;;
+  aarch64)
+    echo Testing Chromium browser in arm64
+    ;;
+  *)
+    echo Unsupported architecture
+    exit 1
+    ;;
+esac
+
 echo Test Chromium in cypress/base
-npm ci                           # Install dependencies
-docker build -t test-chromium .  # Build a new image
+npm ci # Install dependencies
+docker build -t test-chromium . # Build a new image
 docker run --rm --entrypoint bash test-chromium -c "npx cypress run --browser chromium" # Run Cypress test using Chromium

examples/firefox-esr/package.json

@@ -9,6 +9,6 @@
   },
   "private": true,
   "devDependencies": {
-    "cypress": "^13.17.0"
+    "cypress": "^14.0.0"
   }
 }