Merge pull request #2121 from tweag/ylecornec/default_9_4_6

Set default ghc verion 9.4.6

.github/workflows/workflow.yaml

@@ -56,7 +56,7 @@ jobs:
             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.6
+          - ghc: 9.2.8
             bzlmod: true
           - ghc: 9.6.2
             bzlmod: true
@@ -149,7 +149,7 @@ jobs:
         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
-          - ghc: 9.4.6
+          - ghc: 9.2.8
             bzlmod: true
           - ghc: 9.6.2
             bzlmod: true

CHANGELOG.md

@@ -3,6 +3,11 @@
 All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/).
+## Next release
+
+### Changed
+
+* Use ghc 9.4.6 by default
 
 ## [0.19] 2024-02-5
 

constants.bzl

@@ -1,2 +1,2 @@
-test_ghc_version = "9.2.8"
+test_ghc_version = "9.4.6"
 test_asterius_version = "0.0.1"

examples/WORKSPACE

@@ -17,14 +17,14 @@ rules_haskell_dependencies()
 load("@rules_haskell//haskell:nixpkgs.bzl", "haskell_register_ghc_nixpkgs")
 
 haskell_register_ghc_nixpkgs(
-    attribute_path = "haskell.compiler.ghc928",
+    attribute_path = "haskell.compiler.ghc946",
     repository = "@rules_haskell//nixpkgs:default.nix",
-    version = "9.2.8",
+    version = "9.4.6",
 )
 
 load("@rules_haskell//haskell:toolchain.bzl", "rules_haskell_toolchains")
 
-rules_haskell_toolchains(version = "9.2.8")
+rules_haskell_toolchains(version = "9.4.6")
 
 load("@rules_nixpkgs_cc//:cc.bzl", "nixpkgs_cc_configure")
 load("@rules_nixpkgs_python//:python.bzl", "nixpkgs_python_configure")

examples/primitive/.github/workflows/ci.yml

@@ -0,0 +1,51 @@
+name: ci
+on:
+  push:
+    branches:
+      - master
+  pull_request: {}
+
+defaults:
+  run:
+    shell: bash
+
+jobs:
+  build:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest]
+        ghc: ['8.0', '8.2', '8.4', '8.6', '8.8', '8.10', '9.0', '9.2', '9.4', '9.6']
+        include:
+        - os: windows-latest
+          ghc: 'latest'
+        - os: macOS-latest
+          ghc: 'latest'
+        ## Already covered by '9.4'
+        # - os: ubuntu-latest
+        #   ghc: 'latest'
+    steps:
+    - uses: actions/checkout@v3
+    - uses: haskell/actions/setup@v2
+      id: setup-haskell-cabal
+      with:
+        ghc-version: ${{ matrix.ghc }}
+        ghcup-release-channel: ${{ matrix.ghcup-release-channel }}
+    - name: Update cabal package database
+      run: cabal update
+    - uses: actions/cache@v3
+      name: Cache cabal stuff
+      with:
+        path: |
+          ${{ steps.setup-haskell-cabal.outputs.cabal-store }}
+          dist-newstyle
+        key: ${{ runner.os }}-${{ matrix.ghc }}
+    - name: Build
+      run: cabal build all --enable-tests
+    - name: Test
+      run: cabal test all --enable-tests
+    - name: Bench
+      run: cabal bench --benchmark-option=-l
+    - name: Haddock
+      run: cabal haddock

examples/primitive/.gitignore

@@ -0,0 +1,27 @@
+dist
+dist-*
+cabal-dev
+*.o
+*.hi
+*.chi
+*.chs.h
+*.dyn_o
+*.dyn_hi
+.hpc
+.hsenv
+.cabal-sandbox/
+cabal.sandbox.config
+*.prof
+*.aux
+*.hp
+*.eventlog
+.stack-work/
+cabal.project.local
+cabal.project.local~
+.HTF/
+.ghc.environment.*
+stack.yaml
+*.swm
+*.swo
+*.swp
+test_results/**

examples/primitive/BUILD.bazel

@@ -11,6 +11,10 @@ haskell_toolchain_library(name = "ghc-prim")
 
 haskell_toolchain_library(name = "rts")
 
+haskell_toolchain_library(name = "template-haskell")
+
+haskell_toolchain_library(name = "deepseq")
+
 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",
     ],
 )