@@ -674,10 +674,6 @@ jobs:
674674 fi
675675 emmake make -j ${{ env.ncpus }} check-cppinterop
676676 cd ./unittests/CppInterOp/
677- # Fresh install browsers, and run Emscripten tests in them
678- # This is to match the Emscripten build instructions, where
679- # we run in a fresh browser, to stop any extra installed
680- # stuff interferring with the running of the tests
681677 # Explaination of options for emrun
682678 # --browser (name of browser on path)
683679 # --kill_exit makes it so that when emrun finishes,
@@ -693,22 +689,6 @@ jobs:
693689 # in userspace.
694690 os="${{ matrix.os }}"
695691 if [[ "${os}" == "macos"* ]]; then
696- # Install Firefox
697- wget "https://download.mozilla.org/?product=firefox-latest&os=osx&lang=en-US" -O Firefox-latest.dmg
698- hdiutil attach Firefox-latest.dmg
699- cp -r /Volumes/Firefox/Firefox.app $PWD
700- hdiutil detach /Volumes/Firefox
701- cd ./Firefox.app/Contents/MacOS/
702- export PATH="$PWD:$PATH"
703- cd -
704-
705- # Install Google Chrome
706- wget https://dl.google.com/chrome/mac/stable/accept_tos%3Dhttps%253A%252F%252Fwww.google.com%252Fintl%252Fen_ph%252Fchrome%252Fterms%252F%26_and_accept_tos%3Dhttps%253A%252F%252Fpolicies.google.com%252Fterms/googlechrome.pkg
707- pkgutil --expand-full googlechrome.pkg google-chrome
708- cd ./google-chrome/GoogleChrome.pkg/Payload/Google\ Chrome.app/Contents/MacOS/
709- export PATH="$PWD:$PATH"
710- cd -
711-
712692 # Run tests in browsers
713693 echo "Running CppInterOpTests in Firefox"
714694 emrun --browser="firefox" --kill_exit --timeout 60 --browser-args="--headless" CppInterOpTests.html
@@ -721,20 +701,6 @@ jobs:
721701 else
722702 export ARCHITECHURE=$(uname -m)
723703 if [[ "$ARCHITECHURE" != "aarch64" ]]; then
724- # Install Google Chrome
725- wget https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb
726- dpkg-deb -x google-chrome-stable_current_amd64.deb $PWD/chrome
727- cd ./chrome/opt/google/chrome/
728- export PATH="$PWD:$PATH"
729- cd -
730-
731- # Install Firefox
732- wget https://ftp.mozilla.org/pub/firefox/releases/138.0.1/linux-x86_64/en-GB/firefox-138.0.1.tar.xz
733- tar -xJf firefox-138.0.1.tar.xz
734- cd ./firefox
735- export PATH="$PWD:$PATH"
736- cd -
737-
738704 # Run tests in browsers
739705 echo "Running CppInterOpTests in Firefox"
740706 emrun --browser="firefox" --kill_exit --timeout 60 --browser-args="--headless" CppInterOpTests.html
@@ -745,13 +711,6 @@ jobs:
745711 echo "Running DynamicLibraryManagerTests in Google Chrome"
746712 emrun --browser="google-chrome" --kill_exit --timeout 60 --browser-args="--headless --no-sandbox" DynamicLibraryManagerTests.html
747713 else
748- # Install Firefox
749- wget https://ftp.mozilla.org/pub/firefox/releases/138.0.1/linux-aarch64/en-GB/firefox-138.0.1.tar.xz
750- tar -xJf firefox-138.0.1.tar.xz
751- cd ./firefox
752- export PATH="$PWD:$PATH"
753- cd -
754-
755714 # Run tests in browsers
756715 echo "Running CppInterOpTests in Firefox"
757716 emrun --browser="firefox" --kill_exit --timeout 60 --browser-args="--headless" CppInterOpTests.html
0 commit comments