Building the most straightforward tests with GHC Bindist compiled with Hadrian

.bazelrc.common

@@ -62,6 +62,8 @@ build:ci-common --symlink_prefix=bazel-ci-
 build:ci-common --repository_cache=~/repo-cache/
 build:ci-common --experimental_repository_cache_hardlinks
 
+test:ci-common --test_verbose_timeout_warnings
+
 # Use a remote cache during CI
 build:ci-windows-bindist --bes_upload_mode=wait_for_upload_complete --bes_timeout=600s
 # On Github CI for Windows, we see intermittent connection failures to BuildBuddy
@@ -102,6 +104,8 @@ build:linux-bindist --experimental_strict_action_env
 build:macos-bindist --experimental_strict_action_env
 build:windows-bindist --experimental_strict_action_env
 
+build:macos-bindist --toolchain_resolution_debug='.*'
+
 # Note [backward compatible options]
 build:linux-bindist --incompatible_enable_cc_toolchain_resolution
 build:macos-bindist --incompatible_enable_cc_toolchain_resolution

.github/workflows/workflow.yaml

@@ -10,106 +10,6 @@ env:
   cache-version: 0
 
 jobs:
-  test-nixpkgs:
-    name: Build & Test - Nixpkgs
-    concurrency:
-      group: ${{ github.workflow }}-${{ github.ref }}-${{ matrix.os }}-${{ matrix.module }}-${{ matrix.bzlmod }}-${{ matrix.ghc }}-nixpkgs
-      cancel-in-progress: ${{ github.ref != 'refs/heads/master' }}
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [ubuntu-latest, macos-11]
-        module: [rules_haskell, rules_haskell_nix, rules_haskell_tests]
-        bzlmod: [true, false]
-        ghc:
-          - 9.2.5
-          - 9.4.5
-        exclude:
-          - module: rules_haskell_nix
-            bzlmod: false
-          # TODO: in a MODULE.bazel file we declare version specific dependencies, would need to use stack snapshot json
-          #       and stack config per GHC version
-          - ghc: 9.4.5
-            bzlmod: true
-    runs-on: ${{ matrix.os }}
-    steps:
-      - if: ${{ matrix.os == 'ubuntu-latest' }}
-        run: |-
-          sudo swapoff -a
-          sudo rm -rf /swapfile /usr/share/dotnet /usr/local/lib/android /opt/ghc
-          docker rmi $(docker images -q) -f
-      - uses: actions/checkout@v4
-      - name: Mount Bazel cache
-        uses: actions/cache@v3
-        with:
-          path: ~/repo-cache
-          key: repo-cache-${{ runner.os }}-nixpkgs-${{ env.cache-version }}
-      - uses: cachix/install-nix-action@v23
-        with:
-          nix_path: nixpkgs=./nixpkgs/default.nix
-          extra_nix_config: |
-            trusted-public-keys = cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY= hydra.iohk.io:f/Ea+s+dFdN+3Y/G+FDgSq+a5NEWhJGzdjvKNGv0/EQ=
-            extra-substituters = https://cache.iog.io
-      - name: Configure
-        env:
-          BUILDBUDDY_API_KEY: ${{ secrets.BUILDBUDDY_API_KEY }}
-        run: |
-          # Avoid failures of the form `deadline exceeded after 14999958197ns DEADLINE_EXCEEDED`.
-          # See https://github.com/tweag/rules_haskell/issues/1498 and https://github.com/tweag/rules_haskell/pull/1692.
-          [[ ${{ runner.os }} == Linux ]] && sudo sysctl -w net.ipv4.tcp_keepalive_time=60
-          case ${{ runner.os }} in
-            macOS) BUILD_CONFIG=ci-macos-nixpkgs;;
-            Linux) BUILD_CONFIG=ci-linux-nixpkgs;;
-          esac
-          if [ -z "$BUILDBUDDY_API_KEY" ]; then
-              cache_setting='--noremote_upload_local_results'
-          else
-              cache_setting="--remote_header=x-buildbuddy-api-key=$BUILDBUDDY_API_KEY"
-          fi
-          cat >.bazelrc.local <<EOF
-          common --config=ci
-          build --config=$BUILD_CONFIG
-          build $cache_setting
-          common --enable_bzlmod=${{ matrix.bzlmod }}
-          EOF
-          cp .bazelrc.local rules_haskell_nix
-          cp .bazelrc.local rules_haskell_tests
-          cat >~/.netrc <<EOF
-          machine api.github.com
-                  password ${{ secrets.GITHUB_TOKEN }}
-          EOF
-      - name: Check Bazel version
-        run: |
-          nix-shell --arg docTools false --argstr ghcVersion ${{ matrix.ghc }} --pure --run .ci/check-bazel-version
-      - name: Build & test - rules_haskell
-        if: matrix.module == 'rules_haskell'
-        run: |
-          nix-shell --arg docTools false --argstr ghcVersion ${{ matrix.ghc }} --pure --run '
-            set -euo pipefail
-            bazel test //...
-            bazel build //docs:api_html
-            bazel build //docs:guide_html
-            '
-      - name: Build & test - rules_haskell_nix
-        if: matrix.module == 'rules_haskell_nix'
-        run: |
-          nix-shell --arg docTools false --argstr ghcVersion ${{ matrix.ghc }} --pure --run '
-            set -euo pipefail
-            cd rules_haskell_nix
-            bazel test //...
-            '
-      - name: Build & test - rules_haskell_tests
-        if: matrix.module == 'rules_haskell_tests'
-        run: |
-          nix-shell --arg docTools false --argstr ghcVersion ${{ matrix.ghc }} --pure --run '
-            set -euo pipefail
-            cd rules_haskell_tests
-            ./tests/run-start-script.sh --use-nix
-            bazel build //tests:run-tests
-            ./bazel-ci-bin/tests/run-tests
-            bazel coverage //...
-            '
-
   test-bindist:
     name: Build & Test - bindist
     concurrency:
@@ -118,12 +18,12 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest, macos-11, windows-latest]
+        os: [ubuntu-latest, macos-latest]
         module: [rules_haskell, rules_haskell_tests]
         bzlmod: [true, false]
         ghc:
           - 9.2.5
-          - 9.4.5
+          #- 9.4.5
         exclude:
           # TODO: in a MODULE.bazel file we declare version specific dependencies, would need to use stack snapshot json
           #       and stack config per GHC version
@@ -209,7 +109,7 @@ jobs:
             # On Windows `//...` expands to `/...`.
             bazel test ///...
           else
-            bazel test //...
+            bazel test --keep_going -- //...
           fi
 
       - name: Build & test - rules_haskell_tests
@@ -225,7 +125,7 @@ jobs:
             # On Windows `//...` expands to `/...`.
             bazel test ///...
           else
-            bazel test //...
+            bazel test --keep_going -- //... -//tests/asterius/...
           fi
           # Test stack_snapshot pinning
           # NOTE keep in sync with tests/RunTests.hs

WORKSPACE

@@ -64,7 +64,7 @@ load(
     "haskell_register_ghc_bindists",
 )
 
-haskell_register_ghc_bindists(version = GHC_VERSION)
+#haskell_register_ghc_bindists(version = GHC_VERSION)
 
 load(
     "@rules_haskell//haskell/asterius:repositories.bzl",
@@ -86,6 +86,46 @@ load("@rules_haskell_npm//:repositories.bzl", "npm_repositories")
 
 npm_repositories()
 
+load(
+    "@rules_haskell//haskell:ghc_bindist_hadrian.bzl",
+    "haskell_register_ghc_bindists_hadrian",
+)
+
+test_ghcopts = [
+    "-XStandaloneDeriving",  # Flag used at compile time
+    "-threaded",  # Flag used at link time
+    # Used by `tests/repl-flags`
+    "-DTESTS_TOOLCHAIN_COMPILER_FLAGS",
+    # this is the default, so it does not harm other tests
+    "-XNoOverloadedStrings",
+]
+
+test_cabalopts = [
+    # Used by `tests/cabal-toolchain-flags`
+    "--ghc-option=-DTESTS_TOOLCHAIN_CABALOPTS",
+    "--haddock-option=--optghc=-DTESTS_TOOLCHAIN_CABALOPTS",
+]
+
+haskell_register_ghc_bindists_hadrian(
+    cabalopts = test_cabalopts,
+    ghcopts = test_ghcopts,
+    sha256 = "9dea9123cd53c0d48e72de68480492eaacc2e0bf487a3cd3dfa3ce18729aa3e4",
+    strip_prefix = "ghc-9.2.5-x86_64-unknown-linux",
+    target = "x86_64-unknown-linux",
+    url = "https://github.com/avdv/testproject/releases/download/ghc-9.2.5/ghc-9.2.5-x86_64-unknown-linux.tar.xz",
+    version = "9.2.5",
+)
+
+haskell_register_ghc_bindists_hadrian(
+    cabalopts = test_cabalopts,
+    ghcopts = test_ghcopts,
+    sha256 = "55c6a09d00aac69efd03112bd5fcf9a50f87060b1feb6c81f8698752bf164536",
+    strip_prefix = "ghc-9.2.5-x86_64-apple-darwin",
+    target = "x86_64-apple-darwin",
+    url = "https://github.com/avdv/testproject/releases/download/ghc-9.2.5/ghc-9.2.5-x86_64-apple-darwin.tar.xz",
+    version = "9.2.5",
+)
+
 register_toolchains(
     "//tests:protobuf-toolchain",
     "//tests:protobuf-toolchain-osx_arm64",

examples/WORKSPACE

@@ -15,11 +15,55 @@ load("@rules_haskell//haskell:repositories.bzl", "rules_haskell_dependencies")
 
 rules_haskell_dependencies()
 
-load("@rules_haskell//haskell:nixpkgs.bzl", "haskell_register_ghc_nixpkgs")
+load(
+    "@rules_haskell//haskell:ghc_bindist_hadrian.bzl",
+    "haskell_register_ghc_bindists_hadrian",
+)
 
-haskell_register_ghc_nixpkgs(
-    attribute_path = "haskell.compiler.ghc925",
-    repository = "@rules_haskell//nixpkgs:default.nix",
+# FIXME copied from non_module_deps_1.bzl
+test_ghcopts = [
+    "-XStandaloneDeriving",  # Flag used at compile time
+    "-threaded",  # Flag used at link time
+    # Used by `tests/repl-flags`
+    "-DTESTS_TOOLCHAIN_COMPILER_FLAGS",
+    # this is the default, so it does not harm other tests
+    "-XNoOverloadedStrings",
+]
+
+test_haddock_flags = ["-U"]
+
+test_repl_ghci_args = [
+    # The repl test will need this flag, but set by the local
+    # `repl_ghci_args`.
+    "-UTESTS_TOOLCHAIN_REPL_FLAGS",
+    # The repl test will need OverloadedString
+    "-XOverloadedStrings",
+]
+
+test_cabalopts = [
+    # Used by `tests/cabal-toolchain-flags`
+    "--ghc-option=-DTESTS_TOOLCHAIN_CABALOPTS",
+    "--haddock-option=--optghc=-DTESTS_TOOLCHAIN_CABALOPTS",
+] + ([
+    # To avoid ghcide linking errors with heapsize on Windows of the form
+    #
+    #   unknown symbol `heap_view_closurePtrs'
+    #
+    # See https://github.com/haskell/ghcide/pull/954
+    "--disable-library-for-ghci",
+] if False else [])
+
+# load(
+#     "@rules_haskell//:non_module_deps_1.bzl", "test_cabalopts", "test_ghcopts"
+# )
+
+haskell_register_ghc_bindists_hadrian(
+    cabalopts = test_cabalopts,
+    ghcopts = test_ghcopts,
+    sha256 = "9dea9123cd53c0d48e72de68480492eaacc2e0bf487a3cd3dfa3ce18729aa3e4",
+    strip_prefix = "ghc-9.2.5-x86_64-unknown-linux",
+    target = "x86_64-unknown-linux",
+    url = "https://github.com/avdv/testproject/releases/download/ghc-9.2.5/ghc-9.2.5-x86_64-unknown-linux.tar.xz",
     version = "9.2.5",
 )
 
@@ -65,7 +109,6 @@ stack_snapshot(
             "-pkg-config",
         ],
     },
-    local_snapshot = "@rules_haskell//:stackage_snapshot.yaml",
     packages = [
         "base",
         "bytestring",
@@ -76,6 +119,8 @@ stack_snapshot(
         "text",
         "text-show",
     ],
+    #local_snapshot = "@rules_haskell//:stackage_snapshot.yaml",
+    snapshot = "nightly-2023-05-12",
     # This example uses an unpinned version of stack_snapshot, meaning that stack is invoked on every build.
     # To switch to pinned stackage dependencies, run `bazel run @stackage-unpinned//:pin` and
     # uncomment the following line.

examples/primitive/BUILD.bazel

@@ -7,10 +7,14 @@ load(
 
 haskell_toolchain_library(name = "base")
 
+haskell_toolchain_library(name = "deepseq")
+
 haskell_toolchain_library(name = "ghc-prim")
 
 haskell_toolchain_library(name = "rts")
 
+haskell_toolchain_library(name = "template-haskell")
+
 cc_library(
     name = "memops",
     srcs = ["cbits/primitive-memops.c"],
@@ -28,8 +32,10 @@ haskell_library(
     visibility = ["//visibility:public"],
     deps = [
         ":base",
+        ":deepseq",
         ":ghc-prim",
         ":memops",
+        ":template-haskell",
         "//transformers",
     ],
 )