diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e74868eef1a3184235d8ed4a3f25b884dd6a6301..bbd74af74ac38e03fb056469320ed7defef5da46 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -206,19 +206,21 @@ aarch64-darwin-nix: .linux-ghcup: extends: .ghcup - image: debian:12 + image: rockylinux:8 before_script: - | - apt update - apt full-upgrade -y - apt install -y \ - build-essential \ - curl \ + dnf upgrade -y + dnf install -y \ + epel-release + crb enable + dnf install -y \ chromium \ - firefox-esr \ + firefox \ jq \ + make \ unzip \ zstd + ln -s /etc/ssl/certs/ca-bundle.crt /etc/ssl/certs/ca-certificates.crt x86_64-linux-ghcup: extends: .linux-ghcup diff --git a/setup.sh b/setup.sh index ec6797b926da9fb2f26882167a84abfbe61be0a9..5076929e56c0ab96a5e15510def798d995f3ecc4 100755 --- a/setup.sh +++ b/setup.sh @@ -114,7 +114,7 @@ mkdir -p "$PREFIX/binaryen" curl -f -L --retry 5 "$(jq -r ".\"$BINARYEN\".url" "$REPO"/autogen.json)" | tar xz -C "$PREFIX/binaryen" --no-same-owner --strip-components=1 mkdir -p "$PREFIX/wasmtime" -curl -f -L --retry 5 "$(jq -r ".\"$WASMTIME\".url" "$REPO"/autogen.json)" | tar x --zstd -C "$PREFIX/wasmtime" --no-same-owner --strip-components=1 +curl -f -L --retry 5 "$(jq -r ".\"$WASMTIME\".url" "$REPO"/autogen.json)" | unzstd | tar x -C "$PREFIX/wasmtime" --no-same-owner --strip-components=1 mkdir -p "$PREFIX/wasm-run/bin" cp -a "$REPO"/wasm-run/*.mjs "$REPO"/wasm-run/*.sh "$PREFIX/wasm-run/bin" diff --git a/tests/ghci.sh b/tests/ghci.sh index c067456903983901cd91a61a38ced28c76acb976..22993bef1b62b8970d8851289f4b36e5b61adbbe 100755 --- a/tests/ghci.sh +++ b/tests/ghci.sh @@ -12,7 +12,7 @@ if [[ $FIREFOX_PATH != "" ]]; then echo -e "$GHCI_SCRIPT" | wasm32-wasi-ghc --interactive -fghci-browser -fghci-browser-puppeteer-launch-opts="{\"browser\":\"firefox\",\"executablePath\":\"$FIREFOX_PATH\"}" fi -CHROME_PATH=$(type -P google-chrome-stable || type -P chromium || echo "") +CHROME_PATH=$(type -P google-chrome-stable || type -P chromium || type -P chromium-browser || echo "") if [[ $CHROME_PATH != "" ]]; then echo -e "$GHCI_SCRIPT" | wasm32-wasi-ghc --interactive -fghci-browser -fghci-browser-puppeteer-launch-opts="{\"browser\":\"chrome\",\"protocol\":\"webDriverBiDi\",\"executablePath\":\"$CHROME_PATH\",\"args\":[\"--no-sandbox\"]}"