From a586332c5e325c879e98057c10e4b9f212b4d4dc Mon Sep 17 00:00:00 2001 From: Jasper Van der Jeugt Date: Sun, 30 Jun 2024 11:32:29 +0200 Subject: [PATCH 1/5] Trigger CI From d361a984f7225cd0eca9eee68d1a7c69734baa8e Mon Sep 17 00:00:00 2001 From: Jasper Van der Jeugt Date: Sun, 30 Jun 2024 11:34:37 +0200 Subject: [PATCH 2/5] bump CI --- .github/workflows/ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ca84385c..234718f0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -19,11 +19,12 @@ jobs: - uses: actions/checkout@v2 - - uses: haskell/actions/setup@v2 + - uses: haskell-actions/setup@v2 name: Setup Haskell Stack with: ghc-version: ${{ matrix.ghc }} stack-version: ${{ matrix.stack }} + enable-stack: true - uses: actions/cache@v2 name: Cache ~/.stack From 861fe32a326919a26d38e35dca6f9936f92c7f4f Mon Sep 17 00:00:00 2001 From: Jasper Van der Jeugt Date: Sun, 30 Jun 2024 11:37:31 +0200 Subject: [PATCH 3/5] bump CI --- .github/workflows/ci.yml | 7 +++---- Makefile | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 234718f0..8134b6d0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -10,7 +10,6 @@ jobs: matrix: os: [ubuntu-latest, macOS-latest] stack: ["2.1.3"] - ghc: ["8.8.3"] steps: - name: Get the version @@ -22,15 +21,15 @@ jobs: - uses: haskell-actions/setup@v2 name: Setup Haskell Stack with: - ghc-version: ${{ matrix.ghc }} - stack-version: ${{ matrix.stack }} enable-stack: true + stack-version: ${{ matrix.stack }} + stack-no-global: true - uses: actions/cache@v2 name: Cache ~/.stack with: path: ~/.stack - key: "${{ runner.os }}-${{ matrix.ghc }}-v9-${{ hashFiles('stylish-haskell.cabal', 'stack.yaml', 'stack.yaml.lock') }}" + key: "${{ runner.os }}-v9-${{ hashFiles('stylish-haskell.cabal', 'stack.yaml', 'stack.yaml.lock') }}" - name: Add ~/.local/bin to PATH run: echo "$HOME/.local/bin" >> $GITHUB_PATH diff --git a/Makefile b/Makefile index 058f0cd2..bd77d0bf 100644 --- a/Makefile +++ b/Makefile @@ -27,7 +27,7 @@ COMPRESS_BIN_DEPS=$(UPX_BINARY) COMPRESS_BIN=upx endif -STACK=stack --system-ghc +STACK=stack # Default target. .PHONY: build From 576d35b055929baf253de57b15cfe7099fe5320b Mon Sep 17 00:00:00 2001 From: Jasper Van der Jeugt Date: Sun, 30 Jun 2024 11:38:39 +0200 Subject: [PATCH 4/5] bump CI --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8134b6d0..fc74a490 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -9,7 +9,7 @@ jobs: strategy: matrix: os: [ubuntu-latest, macOS-latest] - stack: ["2.1.3"] + stack: ["2.7.3"] steps: - name: Get the version From bb920ee6aa3af3fb3768a21b593fd83509cc009d Mon Sep 17 00:00:00 2001 From: Jasper Van der Jeugt Date: Sun, 30 Jun 2024 11:39:53 +0200 Subject: [PATCH 5/5] bump CI --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index fc74a490..bf750ac5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -9,7 +9,7 @@ jobs: strategy: matrix: os: [ubuntu-latest, macOS-latest] - stack: ["2.7.3"] + stack: ["2.15.7"] steps: - name: Get the version