diff --git a/.github/workflows/orca.yml b/.github/workflows/orca.yml index f023c9f63..ff1cce05f 100644 --- a/.github/workflows/orca.yml +++ b/.github/workflows/orca.yml @@ -97,6 +97,14 @@ jobs: CHROME_VERSION_STRING="114.0.5735.198-1" wget "https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_${CHROME_VERSION_STRING}_amd64.deb" sudo dpkg -i "google-chrome-stable_${CHROME_VERSION_STRING}_amd64.deb" + sudo ln -s google-chrome-stable /usr/local/share/chromium + sudo ln -sf google-chrome-stable /usr/bin/chromium + sudo ln -sf google-chrome-stable /usr/bin/google-chrome + CHROME_VERSION="$(google-chrome-stable --version)" + echo $CHROME_VERSION + CHROMIUM_VERSION="$(/usr/bin/chromium --version)" + echo $CHROMIUM_VERSION + - name: Before install run: | diff --git a/bin/ci/script.sh b/bin/ci/script.sh index f1e231c38..f5233b564 100755 --- a/bin/ci/script.sh +++ b/bin/ci/script.sh @@ -22,7 +22,7 @@ if [[ "$ORCA_ENABLE_NIGHTWATCH" == "TRUE" && "$ORCA_SUT_HAS_NIGHTWATCH_TESTS" && SERVER_PID=$! # @todo could we set DRUPAL_TEST_CHROMEDRIVER_AUTOSTART instead of launching Chromedriver manually? - chromedriver --no-sandbox --disable-dev-shm-usage --disable-extensions --disable-gpu --headless --no-sandbox --port=4444 & + chromedriver --disable-dev-shm-usage --disable-extensions --disable-gpu --headless --no-sandbox --port=4444 & CHROMEDRIVER_PID=$! eval "yarn test:nightwatch \\ diff --git a/bin/ci/self-test/script.sh b/bin/ci/self-test/script.sh index 342deb585..bcfc80fd9 100755 --- a/bin/ci/self-test/script.sh +++ b/bin/ci/self-test/script.sh @@ -49,9 +49,11 @@ if [[ "$ORCA_ENABLE_NIGHTWATCH" == "TRUE" && "$ORCA_SUT_HAS_NIGHTWATCH_TESTS" && cd "$ORCA_YARN_DIR" || exit orca fixture:run-server & SERVER_PID=$! + /usr/local/share/chromium --headless --disable-gpu & + CHROME_PID=$! # @todo could we set DRUPAL_TEST_CHROMEDRIVER_AUTOSTART instead of launching Chromedriver manually? - chromedriver --disable-dev-shm-usage --disable-extensions --disable-gpu --headless --no-sandbox --port=4444 & + chromedriver --no-sandbox --disable-dev-shm-usage --disable-extensions --disable-gpu --headless --port=4444 & CHROMEDRIVER_PID=$! eval "yarn test:nightwatch \\ @@ -66,5 +68,6 @@ if [[ "$ORCA_ENABLE_NIGHTWATCH" == "TRUE" && "$ORCA_SUT_HAS_NIGHTWATCH_TESTS" && kill -0 $SERVER_PID kill -0 $CHROMEDRIVER_PID + kill -0 CHROME_PID ) fi