Stable master

.envrc

@@ -0,0 +1,7 @@
+# Check if nix-direnv is already loaded; if not, source it
+if ! has nix_direnv_reload; then
+  source_url "https://raw.githubusercontent.com/nix-community/nix-direnv/3.0.7/direnvrc" "sha256-bn8WANE5a91RusFmRI7kS751ApelG02nMcwRekC/qzc="
+fi
+
+# Use the specified flake to enter the Nix development environment
+use flake github:input-output-hk/devx#ghc98-minimal-ghc

.github/workflows/ci.yml

@@ -0,0 +1,75 @@
+name: CI
+
+# Trigger the workflow on push or pull request, but only for the master branch
+on:
+  pull_request:
+    types:
+      - opened
+      - synchronize
+  push:
+    branches: [master]
+
+  workflow_dispatch:
+
+jobs:
+  cabal:
+    name: ${{ matrix.plat }} / ghc ${{ matrix.ghc }}
+    runs-on: "${{ fromJSON('{\"x86_64-linux\": \"ubuntu-24.04\", \"aarch64-linux\": \"ubuntu-24.04-arm\", \"x86_64-darwin\": \"macos-latest\", \"aarch64-darwin\": \"macos-latest\"}')[matrix.plat] }}"
+
+    strategy:
+      fail-fast: false
+      matrix:
+        plat:
+          - x86_64-linux
+          # - aarch64-linux  # disabled: waiting for devx images to be fixed
+          # - x86_64-darwin  # disabled: waiting for devx images to be fixed
+          - aarch64-darwin
+        ghc: ['98'] # bootstrapping compiler
+
+    steps:
+    - uses: actions/checkout@v4
+      with:
+        submodules: "recursive"
+
+    - uses: input-output-hk/actions/devx@latest
+      with:
+        platform: ${{ matrix.plat }}
+        compiler-nix-name: 'ghc98'
+        minimal: true
+        ghc: true
+
+    - name: Update hackage
+      shell: devx {0}
+      run: cabal update
+
+    # The Makefile will run configure (and boot 😞), we also need to create a
+    # synthetic package before running configure.  Once this nuissance is fixed
+    # we can do proper configure + make again. Until then... we have to live
+    # with the hack of running everything from the make target.
+    # - name: Configure the build
+    #   shell: devx {0}
+    #   run: ./configure
+
+    - name: Build the bindist
+      shell: devx {0}
+      run: make CABAL=$PWD/_build/stage0/bin/cabal
+
+    - name: Upload artifacts
+      uses: actions/upload-artifact@v4
+      with:
+        name: ${{ matrix.plat }}-bindist
+        path: _build/bindist
+
+    - name: Run the testsuite
+      shell: devx {0}
+      run: make test CABAL=$PWD/_build/stage0/bin/cabal
+
+    - name: Upload test results
+      uses: actions/upload-artifact@v4
+      if: ${{ !cancelled() }} # upload test results even if the testsuite failed to pass
+      with:
+        name: ${{ matrix.plat }}-testsuite-results
+        path: |
+          _build/test-perf.csv
+          _build/test-summary.txt
+          _build/test-junit.xml

.gitignore

@@ -221,6 +221,9 @@ missing-win32-tarballs
 VERSION
 GIT_COMMIT_ID
 
+/libraries/ghc-boot-th-next/.synth-stamp
+/libraries/ghc-boot-th-next/ghc-boot-th-next.cabal.in
+
 # -------------------------------------------------------------------------------------
 # when using a docker image, one can mount the source code directory as the home folder
 # -------------------------------------------------------------------------------------

.gitmodules

@@ -8,8 +8,9 @@
 	ignore = untracked
 [submodule "libraries/Cabal"]
 	path = libraries/Cabal
-	url = https://gitlab.haskell.org/ghc/packages/Cabal.git
+	url = https://github.com/stable-haskell/Cabal.git
 	ignore = untracked
+	branch = stable-haskell/feature/cross-compile
 [submodule "libraries/containers"]
 	path = libraries/containers
 	url = https://gitlab.haskell.org/ghc/packages/containers.git
@@ -99,10 +100,6 @@
 	path = utils/hsc2hs
 	url = https://gitlab.haskell.org/ghc/hsc2hs.git
 	ignore = untracked
-[submodule "libffi-tarballs"]
-	path = libffi-tarballs
-	url = https://gitlab.haskell.org/ghc/libffi-tarballs.git
-	ignore = untracked
 [submodule "gmp-tarballs"]
 	path = libraries/ghc-internal/gmp/gmp-tarballs
 	url = https://gitlab.haskell.org/ghc/gmp-tarballs.git