diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a96c6cfa3b5fec1f79abde291ae86f661dbdcf09..852286c275a7372faefeb045b9ba2abe2776dc4f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -116,17 +116,17 @@ x86_64-linux-ubuntu-9.12: .nix: rules: - if: $UPSTREAM_GHC_FLAVOUR == null + variables: + NIXPKGS_ALLOW_UNFREE: "1" script: - | nix build --json --no-link $NIX_FLAKE_OUTPUTS - nix shell $NIX_BROWSERS .#all_9_12 --command ./tests/ghci.sh - nix shell $NIX_BROWSERS .#all_9_10 --command ./tests/ghci.sh + nix shell --impure $NIX_BROWSERS .#all_9_12 --command ./tests/ghci.sh + nix shell --impure $NIX_BROWSERS .#all_9_10 --command ./tests/ghci.sh .linux-nix: extends: .nix image: nixos/nix - variables: - NIX_BROWSERS: nixpkgs#firefox-bin before_script: - echo "experimental-features = nix-command flakes" >> /etc/nix/nix.conf - echo "cores = $CPUS" >> /etc/nix/nix.conf @@ -138,6 +138,7 @@ x86_64-linux-nix: - x86_64-linux variables: NIX_FLAKE_OUTPUTS: .#all_gmp .#all_native .#all_unreg .#all_9_12 .#all_9_10 .#all_9_8 .#all_9_6 + NIX_BROWSERS: nixpkgs#firefox-bin nixpkgs#google-chrome aarch64-linux-nix: extends: .linux-nix @@ -145,6 +146,7 @@ aarch64-linux-nix: - aarch64-linux variables: NIX_FLAKE_OUTPUTS: .#all_9_12 .#all_9_10 + NIX_BROWSERS: nixpkgs#firefox-bin aarch64-darwin-nix: extends: .nix @@ -152,7 +154,7 @@ aarch64-darwin-nix: - aarch64-darwin variables: NIX_FLAKE_OUTPUTS: .#all_9_12 .#all_9_10 - NIX_BROWSERS: "" + NIX_BROWSERS: nixpkgs#google-chrome .linux-ghcup: image: debian:12 diff --git a/tests/ghci.sh b/tests/ghci.sh index f60c87bf419aeddff4a78b174a0bc8fb2a97a95e..c067456903983901cd91a61a38ced28c76acb976 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 || type -P chromium || echo "") +CHROME_PATH=$(type -P google-chrome-stable || type -P chromium || 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\"]}"