Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Set default ghc verion 9.4.6 #2121

Merged
merged 4 commits into from
Feb 13, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/workflow.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion constants.bzl
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
test_ghc_version = "9.2.8"
test_ghc_version = "9.4.6"
test_asterius_version = "0.0.1"
6 changes: 3 additions & 3 deletions examples/WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
51 changes: 51 additions & 0 deletions examples/primitive/.github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -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
27 changes: 27 additions & 0 deletions examples/primitive/.gitignore
Original file line number Diff line number Diff line change
@@ -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/**
6 changes: 6 additions & 0 deletions examples/primitive/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -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"],
Expand All @@ -28,8 +32,10 @@ haskell_library(
visibility = ["//visibility:public"],
deps = [
":base",
":deepseq",
":ghc-prim",
":memops",
":template-haskell",
"//transformers",
],
)
Expand Down
Loading
Loading