Skip to content
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
2 changes: 1 addition & 1 deletion .github/workflows/haskell-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
timeout-minutes:
60
container:
image: buildpack-deps:focal
image: buildpack-deps:jammy
continue-on-error: ${{ matrix.allow-failure }}
strategy:
matrix:
Expand Down
18 changes: 9 additions & 9 deletions .github/workflows/stack.yml
Original file line number Diff line number Diff line change
Expand Up @@ -78,12 +78,12 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest]
ghc-ver: ['9.10', '9.8', '9.6', '9.4', '9.2.8', '9.0.2', '8.10.7', '8.8.4', '8.6.5', '8.4.4']
ghc-ver: ['9.12', '9.10', '9.8', '9.6', '9.4', '9.2.8', '9.0.2', '8.10.7', '8.8.4', '8.6.5', '8.4.4']
include:
- os: windows-latest
ghc-ver: '9.10'
ghc-ver: '9.12'
- os: macos-latest
ghc-ver: '9.10'
ghc-ver: '9.12'
fail-fast: false

env:
Expand Down Expand Up @@ -153,15 +153,15 @@ jobs:
# # Conditional to ensure this deployment is only run once per action.
# if: >-
# startsWith(github.ref, 'refs/tags/v')
# && matrix.ghc-ver == '9.10'
# && matrix.ghc-ver == '9.12'
# run: |
# DIST_TGZ=$(cabal sdist | tail -1)
# echo "DIST_TGZ=${DIST_TGZ}" >> "${GITHUB_ENV}"

# - name: Source tarball release
# if: >-
# startsWith(github.ref, 'refs/tags/v')
# && matrix.ghc-ver == '9.10'
# && matrix.ghc-ver == '9.12'
# # uses: softprops/action-gh-release@v1
# # with:
# # draft: true
Expand All @@ -182,7 +182,7 @@ jobs:
if: >-
startsWith(github.ref, 'refs/tags/v')
&& runner.os == 'Linux'
&& matrix.ghc-ver == '9.10'
&& matrix.ghc-ver == '9.12'
run: |
FIXW_BIN=fix-whitespace-${FIXW_VERSION}-linux.binary
cp -p "${FIXW_EXE}" "${FIXW_BIN}"
Expand All @@ -193,7 +193,7 @@ jobs:
# if: >-
# startsWith(github.ref, 'refs/tags/v')
# && runner.os == 'Linux'
# && matrix.ghc-ver == '9.10'
# && matrix.ghc-ver == '9.12'
# # uses: softprops/action-gh-release@v1
# # with:
# # draft: true
Expand Down Expand Up @@ -274,7 +274,7 @@ jobs:
# - name: Upload binary
# if: >-
# startsWith(github.ref, 'refs/tags/v')
# && (matrix.ghc-ver == '9.10' || runner.os != 'Linux')
# && (matrix.ghc-ver == '9.12' || runner.os != 'Linux')
# uses: actions/upload-release-asset@v1
# env:
# GITHUB_TOKEN: ${{ github.token }}
Expand All @@ -287,7 +287,7 @@ jobs:
- name: Upload binary
if: >-
startsWith(github.ref, 'refs/tags/v')
&& (matrix.ghc-ver == '9.10' || runner.os != 'Linux')
&& (matrix.ghc-ver == '9.12' || runner.os != 'Linux')
env:
GITHUB_TOKEN: ${{ github.token }}
run: |
Expand Down
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
*~
*.lock
*.log
*.rej
.ghc.environment.*
/.stack-work/
/dist-newstyle/
/dist/
cabal.project.local
cabal.project.*
stack*.yaml.lock
stack.yaml
1 change: 0 additions & 1 deletion cabal.haskell-ci
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
branches: master
distribution: focal
1 change: 1 addition & 0 deletions fix-whitespace.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ extra-doc-files:
README.md
fix-whitespace.yaml
-- stack-supported GHCs
stack-9.12.yaml
stack-9.10.yaml
stack-9.8.yaml
stack-9.6.yaml
Expand Down
4 changes: 1 addition & 3 deletions stack-9.10.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1 @@
resolver: nightly-2025-05-09
compiler: ghc-9.10.2
compiler-check: match-exact
resolver: lts-24.1
1 change: 1 addition & 0 deletions stack-9.12.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
resolver: nightly-2025-07-23
2 changes: 1 addition & 1 deletion stack-9.8.yaml
Original file line number Diff line number Diff line change
@@ -1 +1 @@
resolver: lts-23.21
resolver: lts-23.27
Loading