Skip to content

Commit

Permalink
Update docs, workflows and makefiles to use ghc-9.8.
Browse files Browse the repository at this point in the history
  • Loading branch information
csasarak committed Aug 16, 2024
1 parent 0cf7413 commit 68fed31
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 12 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/bench.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build-all.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
14 changes: 7 additions & 7 deletions docs/contributing/HACKING.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
<long running output, about 4 min on my machine>
$ ghcup set ghc 9.4
$ ghcup set ghc 9.8
$ cabal update
$ cabal build
```
Expand All @@ -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`
Expand Down
1 change: 0 additions & 1 deletion spectrometer.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down

0 comments on commit 68fed31

Please sign in to comment.