From 3e3d28ec08974f09c7f19bb3060816c9b003e602 Mon Sep 17 00:00:00 2001 From: Matthew Kaney Date: Tue, 16 Jan 2024 12:11:32 -0500 Subject: [PATCH 1/4] Unify conditions for build actions --- .github/workflows/listener-build-linux.yml | 9 +++++++-- .github/workflows/listener-build-macosx.yml | 9 +++++++-- .github/workflows/listener-build-windows.yml | 9 +++++++-- .github/workflows/nix.yml | 9 +++++---- 4 files changed, 26 insertions(+), 10 deletions(-) diff --git a/.github/workflows/listener-build-linux.yml b/.github/workflows/listener-build-linux.yml index 8cd8512d9..f30d8e2f7 100644 --- a/.github/workflows/listener-build-linux.yml +++ b/.github/workflows/listener-build-linux.yml @@ -1,6 +1,11 @@ name: build-listener-linux - -on: [push, pull_request] +on: + push: + paths-ignore: + - "**.md" + pull_request: + paths-ignore: + - "**.md" jobs: build: diff --git a/.github/workflows/listener-build-macosx.yml b/.github/workflows/listener-build-macosx.yml index 7cd4f8eb1..6ef91601b 100644 --- a/.github/workflows/listener-build-macosx.yml +++ b/.github/workflows/listener-build-macosx.yml @@ -1,6 +1,11 @@ name: build-listener-macosx - -on: [push, pull_request] +on: + push: + paths-ignore: + - "**.md" + pull_request: + paths-ignore: + - "**.md" jobs: build: diff --git a/.github/workflows/listener-build-windows.yml b/.github/workflows/listener-build-windows.yml index 6b54908d7..bf2014205 100644 --- a/.github/workflows/listener-build-windows.yml +++ b/.github/workflows/listener-build-windows.yml @@ -1,6 +1,11 @@ name: build-listener-windows - -on: [push, pull_request] +on: + push: + paths-ignore: + - "**.md" + pull_request: + paths-ignore: + - "**.md" jobs: build: diff --git a/.github/workflows/nix.yml b/.github/workflows/nix.yml index e608b9dfb..26a213b77 100644 --- a/.github/workflows/nix.yml +++ b/.github/workflows/nix.yml @@ -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: From 15e2210b6dfa09a06d79d04a33951a37ba60045c Mon Sep 17 00:00:00 2001 From: Matthew Kaney Date: Tue, 16 Jan 2024 12:28:53 -0500 Subject: [PATCH 2/4] Disable tidal-listener builds on Nix --- .github/workflows/nix.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/nix.yml b/.github/workflows/nix.yml index 26a213b77..44f66746f 100644 --- a/.github/workflows/nix.yml +++ b/.github/workflows/nix.yml @@ -32,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: From 88d5a3c778c98c02e6df65ffd5200d3b50f979ee Mon Sep 17 00:00:00 2001 From: Matthew Kaney Date: Wed, 7 Feb 2024 14:17:28 -0500 Subject: [PATCH 3/4] Update haskellish dependency for Stack resolving --- stack.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/stack.yaml b/stack.yaml index b12824c46..7962e96b1 100644 --- a/stack.yaml +++ b/stack.yaml @@ -1,4 +1,4 @@ -resolver: lts-20.5 +resolver: lts-22.8 packages: - '.' @@ -8,6 +8,6 @@ packages: extra-deps: - hosc-0.20 - - haskellish-0.3.2.1 + - haskellish-0.3.2.2 From a2388a4d0d5d37c553d1ad6daa7f96aae5af0ccb Mon Sep 17 00:00:00 2001 From: Matthew Kaney Date: Wed, 21 Feb 2024 16:24:07 -0500 Subject: [PATCH 4/4] Update MTL dependency of tidal-parse --- tidal-parse/tidal-parse.cabal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tidal-parse/tidal-parse.cabal b/tidal-parse/tidal-parse.cabal index bdd3af2be..2c7cfa8b1 100644 --- a/tidal-parse/tidal-parse.cabal +++ b/tidal-parse/tidal-parse.cabal @@ -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)