Skip to content

Commit

Permalink
Merge pull request #582 from conjure-cp/ghc94support
Browse files Browse the repository at this point in the history
Adding ghc-9.4 support
  • Loading branch information
ozgurakgun committed Aug 23, 2023
2 parents 2b4e438 + c757c98 commit 344fe45
Show file tree
Hide file tree
Showing 6 changed files with 15 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:

strategy:
matrix:
GHC_VERSION: [9.2]
GHC_VERSION: ["9.0", "9.2", "9.4"]
os: [ubuntu-latest, macos-latest]

runs-on: ${{ matrix.os }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:

strategy:
matrix:
GHC_VERSION: [9.2]
GHC_VERSION: [9.4]
os: [ubuntu-latest]

runs-on: ${{ matrix.os }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:

strategy:
matrix:
GHC_VERSION: [9.2]
GHC_VERSION: [9.4]
os: [ubuntu-latest]

runs-on: ${{ matrix.os }}
Expand Down
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ SHELL := /bin/bash

# these are default values
# override by calling the makefile like so: "GHC_VERSION=9.2 make"
export GHC_VERSION?=9.2
export GHC_VERSION?=9.4
export BIN_DIR?=${HOME}/.local/bin
export PATH := $(BIN_DIR):$(PATH)
export CI?=false
Expand All @@ -15,8 +15,8 @@ export LIMIT_TIME?=10
install:
@echo "Using GHC version ${GHC_VERSION} (major version)"
@echo "Set the environment variable GHC_VERSION to change this location."
@echo "For example: \"GHC_VERSION=9.2 make install\""
@echo "Supported versions: 9.0, 9.2"
@echo "For example: \"GHC_VERSION=9.4 make install\""
@echo "Supported versions: 9.0, 9.2, 9.4"
@echo ""
@echo "Installing executables to ${BIN_DIR}"
@echo "Add this directory to your PATH."
Expand Down
2 changes: 1 addition & 1 deletion etc/hs-deps/stack-9.2.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
resolver: lts-20.23
resolver: lts-20.26
packages:
- '.'
system-ghc: true
Expand Down
8 changes: 8 additions & 0 deletions etc/hs-deps/stack-9.4.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
resolver: lts-21.8
packages:
- '.'
system-ghc: true
install-ghc: true
extra-deps:
- lsp-1.6.0.0
- lsp-types-1.6.0.0

0 comments on commit 344fe45

Please sign in to comment.