From 68fed31ae1250818870a5f35af4b14cd8429e71d Mon Sep 17 00:00:00 2001 From: Christopher Sasarak Date: Fri, 16 Aug 2024 16:42:06 -0500 Subject: [PATCH] Update docs, workflows and makefiles to use ghc-9.8. --- .github/workflows/bench.yml | 2 +- .github/workflows/build-all.yml | 4 ++-- Makefile | 2 +- docs/contributing/HACKING.md | 14 +++++++------- spectrometer.cabal | 1 - 5 files changed, 11 insertions(+), 12 deletions(-) diff --git a/.github/workflows/bench.yml b/.github/workflows/bench.yml index 428bf2cc72..a76bf1018d 100644 --- a/.github/workflows/bench.yml +++ b/.github/workflows/bench.yml @@ -5,7 +5,7 @@ jobs: benchmarks: name: benchmarks runs-on: ubuntu-latest - container: fossa/haskell-static-alpine:ghc-9.4.8 + container: fossa/haskell-static-alpine:ghc-9.8 steps: - uses: dtolnay/rust-toolchain@stable diff --git a/.github/workflows/build-all.yml b/.github/workflows/build-all.yml index 84f31a3ede..2ba2c45f11 100644 --- a/.github/workflows/build-all.yml +++ b/.github/workflows/build-all.yml @@ -315,8 +315,8 @@ jobs: echo ${GITHUB_SHA:0:12} VERSION=$(echo $(Linux-binaries/fossa --version)) - EXPECTED="fossa-cli version ${{ steps.get-version.outputs.VERSION }} (revision ${GITHUB_SHA:0:12} compiled with ghc-9.4)" - echo " VERSION: $VERSION" + EXPECTED="fossa-cli version ${{ steps.get-version.outputs.VERSION }} (revision ${GITHUB_SHA:0:12} compiled with ghc-9.8)" + echo "VERSION: $VERSION" echo "EXPECTED: $EXPECTED" [ "$GITHUB_REF_TYPE" = "tag" ] && echo "Ref type OK" diff --git a/Makefile b/Makefile index b989f97974..8185cc5616 100644 --- a/Makefile +++ b/Makefile @@ -3,7 +3,7 @@ current_dir := $(dir $(abspath $(lastword $(MAKEFILE_LIST)))) FMT_OPTS := -co -XTypeApplications -o -XImportQualifiedPost FIND_OPTS := src test integration-test -type f -name '*.hs' -GHC_VERSION := 9.4.8 +GHC_VERSION := 9.8.2 DEV_TOOLS := ghcr.io/fossas/haskell-dev-tools:${GHC_VERSION} MOUNTED_DEV_TOOLS_OPTS := --rm MOUNTED_DEV_TOOLS_OPTS += --mount "type=bind,source=${current_dir},target=/fossa-cli" diff --git a/docs/contributing/HACKING.md b/docs/contributing/HACKING.md index 83d6752689..8c66b35e9f 100644 --- a/docs/contributing/HACKING.md +++ b/docs/contributing/HACKING.md @@ -14,9 +14,9 @@ On Macs you need to have installed the developer tooling using `xcode-select --i Use [ghcup][ghcup] to install the `cabal` cli tool and the ghc version we're using: ```sh -$ ghcup install ghc 9.4 +$ ghcup install ghc 9.8 -$ ghcup set ghc 9.4 +$ ghcup set ghc 9.8 $ cabal update $ cabal build ``` @@ -29,16 +29,16 @@ In previous GHC versions (8.10), `llvm` was required Ok, the quickstart worked for you, but why, and how? -> `ghcup install ghc 9.4` +> `ghcup install ghc 9.8` When you install `ghcup`, `ghc` and `cabal-install` are installed automatically as part of the initial installation (see [Tools](#tools) for descriptions of `ghc` and `cabal-install`). -The `ghc` version that is automatically installed may not be the correct version we use (though it may work just fine). So we install the correct version with `ghcup install ghc 9.4`. +The `ghc` version that is automatically installed may not be the correct version we use (though it may work just fine). So we install the correct version with `ghcup install ghc 9.8`. Currently, the best place to check the correct version is our CI build files (try `.github/workflows/build.yml`). -> `ghcup set ghc 9.4` +> `ghcup set ghc 9.8` -`ghcup` works by setting symlinks to the "active" version of the tool you're using. Here, we're telling `ghcup` to set GHC 9.4 as the active GHC version. -Now, when you run `ghc`, you'll be running GHC 9.4. +`ghcup` works by setting symlinks to the "active" version of the tool you're using. Here, we're telling `ghcup` to set GHC 9.8 as the active GHC version. +Now, when you run `ghc`, you'll be running GHC 9.8. > `cabal update` diff --git a/spectrometer.cabal b/spectrometer.cabal index 3e0bc4e203..7aa0e51565 100644 --- a/spectrometer.cabal +++ b/spectrometer.cabal @@ -551,7 +551,6 @@ test-suite unit-tests type: exitcode-stdio-1.0 hs-source-dirs: test main-is: test.hs - ghc-options: -Wwarn=x-partial -- cabal-fmt: expand test other-modules: