Skip to content

Commit

Permalink
Merge pull request #1062 from mindofmatthew/1.9-build-fixes
Browse files Browse the repository at this point in the history
Fix build process for 1.9

Fixes #1054
Fixes #1069
  • Loading branch information
matthewkaney authored Feb 27, 2024
2 parents 36d94a8 + a2388a4 commit eb4264c
Show file tree
Hide file tree
Showing 6 changed files with 30 additions and 14 deletions.
9 changes: 7 additions & 2 deletions .github/workflows/listener-build-linux.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
name: build-listener-linux

on: [push, pull_request]
on:
push:
paths-ignore:
- "**.md"
pull_request:
paths-ignore:
- "**.md"

jobs:
build:
Expand Down
9 changes: 7 additions & 2 deletions .github/workflows/listener-build-macosx.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
name: build-listener-macosx

on: [push, pull_request]
on:
push:
paths-ignore:
- "**.md"
pull_request:
paths-ignore:
- "**.md"

jobs:
build:
Expand Down
9 changes: 7 additions & 2 deletions .github/workflows/listener-build-windows.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
name: build-listener-windows

on: [push, pull_request]
on:
push:
paths-ignore:
- "**.md"
pull_request:
paths-ignore:
- "**.md"

jobs:
build:
Expand Down
11 changes: 6 additions & 5 deletions .github/workflows/nix.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
# A set of CI jobs for checking the Nix flake.

name: "nix"

on:
pull_request:
push:
branches:
- master
paths-ignore:
- "**.md"
pull_request:
paths-ignore:
- "**.md"

jobs:
cancel-previous-runs:
Expand All @@ -31,7 +32,7 @@ jobs:
needs: cancel-previous-runs
strategy:
matrix:
package: [tidal, tidal-link, tidal-listener, tidal-parse]
package: [tidal, tidal-link, tidal-parse]
os: [ubuntu-latest, macos-latest]
runs-on: ${{ matrix.os }}
steps:
Expand Down
4 changes: 2 additions & 2 deletions stack.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
resolver: lts-20.5
resolver: lts-22.8

packages:
- '.'
Expand All @@ -8,6 +8,6 @@ packages:

extra-deps:
- hosc-0.20
- haskellish-0.3.2.1
- haskellish-0.3.2.2


2 changes: 1 addition & 1 deletion tidal-parse/tidal-parse.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ library
, template-haskell
, haskellish >= 0.3.2 && < 0.4
, containers < 0.7
, mtl >= 2.2.2 && <2.3
, mtl >= 2.2.2 && <2.4
, text < 2.1

if !impl(ghc >= 8.4.1)
Expand Down

0 comments on commit eb4264c

Please sign in to comment.