From 2663642c1fab436da804a1901c65569932b69893 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Samuel=20G=C3=A9lineau?= Date: Thu, 8 Feb 2024 22:27:49 -0500 Subject: [PATCH 1/4] enable the 'Run workflow' button --- .github/workflows/ci.yml | 2 ++ .github/workflows/installation-methods.yml | 2 ++ 2 files changed, 4 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8860c65..dfdec50 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -12,6 +12,8 @@ on: # Build once a month, to detect missing upper bounds. schedule: - cron: '0 0 1 * *' + + workflow_dispatch: jobs: stack: diff --git a/.github/workflows/installation-methods.yml b/.github/workflows/installation-methods.yml index 6cfab95..75d81d3 100644 --- a/.github/workflows/installation-methods.yml +++ b/.github/workflows/installation-methods.yml @@ -12,6 +12,8 @@ on: #pull_request: # types: [opened, synchronize] + workflow_dispatch: + jobs: # the stack installation method is already covered by the regular CI tests installation-methods: From 69bd018a0fa49ffa11b578ed441b82d1ae80bb00 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Samuel=20G=C3=A9lineau?= Date: Thu, 8 Feb 2024 22:47:43 -0500 Subject: [PATCH 2/4] switch to haskell-actions/setup@v2 --- .github/workflows/ci.yml | 4 ++-- .github/workflows/installation-methods.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index dfdec50..72cc5c3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -52,7 +52,7 @@ jobs: .stack-work key: ${{ runner.os }}-stack-${{ hashFiles(matrix.stack_yaml) }}-6 - - uses: haskell/actions/setup@v1 + - uses: haskell-actions/setup@v2 id: setup-haskell-stack name: Setup Stack with: @@ -103,7 +103,7 @@ jobs: steps: - uses: actions/checkout@v2 - - uses: haskell/actions/setup@v1 + - uses: haskell-actions/setup@v2 id: setup-haskell-cabal name: Setup Cabal with: diff --git a/.github/workflows/installation-methods.yml b/.github/workflows/installation-methods.yml index 75d81d3..7fa50dc 100644 --- a/.github/workflows/installation-methods.yml +++ b/.github/workflows/installation-methods.yml @@ -28,14 +28,14 @@ jobs: steps: - uses: actions/checkout@v2 - - uses: haskell/actions/setup@v1 + - uses: haskell-actions/setup@v2 if: matrix.method == 'v1-install' || matrix.method == 'cabal-sandbox' id: setup-haskell-cabal_1 name: Setup Cabal with: ghc-version: ${{ matrix.ghc }} cabal-version: 3.2 - - uses: haskell/actions/setup@v1 + - uses: haskell-actions/setup@v2 if: matrix.method != 'v1-install' && matrix.method != 'cabal-sandbox' id: setup-haskell-cabal_2 name: Setup Cabal From 46f2dfe47856cc71ee8adcf367bc258381faa745 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Samuel=20G=C3=A9lineau?= Date: Thu, 8 Feb 2024 23:08:26 -0500 Subject: [PATCH 3/4] add tested-with hawk probably works with all the ghc versions in-between, but we only run CI for the oldest and newest supported versions, so those are the tested-with versions. --- haskell-awk.cabal | 13 ++++++++----- package.yaml | 4 ++++ 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/haskell-awk.cabal b/haskell-awk.cabal index 00b6b26..c466865 100644 --- a/haskell-awk.cabal +++ b/haskell-awk.cabal @@ -1,10 +1,10 @@ cabal-version: 1.24 --- This file has been generated from package.yaml by hpack version 0.33.0. +-- This file has been generated from package.yaml by hpack version 0.35.2. -- -- see: https://github.com/sol/hpack -- --- hash: 7517e27fc1a323df0f63f63937abf935ca1ecdd5376effed8078a1c1dd86928a +-- hash: 186d50c3926564fc359e64329c322981465bb7d43c4c1c3fb8f2edfa8c60a5f0 name: haskell-awk version: 1.2.0.1 @@ -18,6 +18,9 @@ maintainer: Samuel Gélineau , Jens Petersen =8.0.2 , list-t >=1 , stringsearch >=0.3.6.6 + default-language: Haskell2010 if os(windows) build-depends: base <0 - default-language: Haskell2010 executable hawk main-is: Main.hs @@ -133,10 +136,10 @@ executable hawk , process >=1.4.3.0 , template-haskell >=2.11.1.0 , transformers >=0.5.2.0 + default-language: Haskell2010 if os(windows) build-depends: base <0 - default-language: Haskell2010 test-suite reference type: exitcode-stdio-1.0 @@ -216,7 +219,7 @@ test-suite reference , test-framework-hunit >=0.3.0.2 , time >=1.6.0.1 , transformers >=0.5.2.0 + default-language: Haskell2010 if os(windows) build-depends: base <0 - default-language: Haskell2010 diff --git a/package.yaml b/package.yaml index a895c86..fb5ad01 100644 --- a/package.yaml +++ b/package.yaml @@ -90,3 +90,7 @@ tests: - test-framework-hunit >= 0.3.0.2 - time >= 1.6.0.1 - transformers >= 0.5.2.0 + +tested-with: + - GHC==8.0.2 + - GHC==8.10.4 From b4c74405fb0af873faafd0491b952bb23c32c04e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Samuel=20G=C3=A9lineau?= Date: Thu, 8 Feb 2024 23:11:49 -0500 Subject: [PATCH 4/4] the latest version of ghc is not supported yet --- .github/workflows/ci.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 72cc5c3..dda7ce5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -96,8 +96,12 @@ jobs: # Check that our upper bounds are correct by building with the latest # version of everything. We use cabal because it uses the latest # versions of our dependencies allowed by our upper bounds. + # + # TODO: revert to "ghc: latest" once the latest version of ghc is + # supported, so we can detect when an even-more-recent version of ghc + # is released and breaks hawk. - name: newest - ghc: latest + ghc: 8.10.4 os: ubuntu-latest steps: