From de29d13e120c96deefea3e8027d2799ddb39983c Mon Sep 17 00:00:00 2001 From: Joris Dral Date: Wed, 8 Mar 2023 10:25:22 +0100 Subject: [PATCH 1/4] Update copyright to 2023 --- io-classes/NOTICE | 2 +- io-classes/io-classes.cabal | 2 +- io-sim/NOTICE | 2 +- io-sim/io-sim.cabal | 2 +- strict-stm/NOTICE | 2 +- strict-stm/strict-stm.cabal | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/io-classes/NOTICE b/io-classes/NOTICE index 536c4061..2787a02a 100644 --- a/io-classes/NOTICE +++ b/io-classes/NOTICE @@ -1,4 +1,4 @@ -Copyright 2019 Input Output (Hong Kong) Ltd. +Copyright 2019-2023 Input Output (Hong Kong) Ltd. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/io-classes/io-classes.cabal b/io-classes/io-classes.cabal index 1c3e8dae..355fd637 100644 --- a/io-classes/io-classes.cabal +++ b/io-classes/io-classes.cabal @@ -6,7 +6,7 @@ license: Apache-2.0 license-files: LICENSE NOTICE -copyright: 2019 Input Output (Hong Kong) Ltd. +copyright: 2019-2023 Input Output (Hong Kong) Ltd. author: Alexander Vieth, Marcin Szamotulski, Duncan Coutts maintainer: category: Control diff --git a/io-sim/NOTICE b/io-sim/NOTICE index 3a29844a..2787a02a 100644 --- a/io-sim/NOTICE +++ b/io-sim/NOTICE @@ -1,4 +1,4 @@ -Copyright 2019-2020 Input Output (Hong Kong) Ltd. +Copyright 2019-2023 Input Output (Hong Kong) Ltd. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/io-sim/io-sim.cabal b/io-sim/io-sim.cabal index 84b69ab3..ffca1c38 100644 --- a/io-sim/io-sim.cabal +++ b/io-sim/io-sim.cabal @@ -7,7 +7,7 @@ license: Apache-2.0 license-files: LICENSE NOTICE -copyright: 2019-2020 Input Output (Hong Kong) Ltd. +copyright: 2019-2023 Input Output (Hong Kong) Ltd. author: Duncan Coutts, Marcin Szamotulski, Alexander Vieth maintainer: category: Testing diff --git a/strict-stm/NOTICE b/strict-stm/NOTICE index 7f15f2a0..2787a02a 100644 --- a/strict-stm/NOTICE +++ b/strict-stm/NOTICE @@ -1,4 +1,4 @@ -Copyright 2019-2022 Input Output (Hong Kong) Ltd. +Copyright 2019-2023 Input Output (Hong Kong) Ltd. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/strict-stm/strict-stm.cabal b/strict-stm/strict-stm.cabal index 131d7562..30258e49 100644 --- a/strict-stm/strict-stm.cabal +++ b/strict-stm/strict-stm.cabal @@ -9,7 +9,7 @@ license: Apache-2.0 license-files: LICENSE NOTICE -copyright: 2019-2021 Input Output (Hong Kong) Ltd. +copyright: 2019-2023 Input Output (Hong Kong) Ltd. author: Alexander Vieth, Marcin Szamotulski, Duncan Coutts maintainer: category: Control From c61d2bf26daef0c92591450bf8c60d6d2198b25e Mon Sep 17 00:00:00 2001 From: Joris Dral Date: Wed, 8 Mar 2023 11:02:04 +0100 Subject: [PATCH 2/4] Update GitHub actions workflow --- .github/workflows/haskell.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/haskell.yml b/.github/workflows/haskell.yml index 38512ac2..33b3a3ef 100644 --- a/.github/workflows/haskell.yml +++ b/.github/workflows/haskell.yml @@ -1,6 +1,8 @@ name: Haskell CI on: + push: + branches: ["main"] pull_request: jobs: @@ -142,7 +144,7 @@ jobs: uses: haskell/actions/setup@v1 id: setup-haskell with: - ghc-version: 8.10.7 + ghc-version: 9.2.5 cabal-version: 3.8.1.0 - name: "Setup cabal bin path" @@ -156,7 +158,7 @@ jobs: key: cache-dependencies-${{ env.CACHE_VERSION }} - name: "Install `stylish-haskell`" - run: cabal install stylish-haskell-0.14.3.0 + run: cabal install stylish-haskell-0.14.4.0 - name: "`stylish-haskell` version" run: | From 1a0f5536e89844ae73f5082d17895c01a0a1aad6 Mon Sep 17 00:00:00 2001 From: Joris Dral Date: Wed, 8 Mar 2023 11:05:48 +0100 Subject: [PATCH 3/4] Updated `tested-with` in `*.cabal` files --- io-classes/io-classes.cabal | 2 +- io-sim/io-sim.cabal | 2 +- strict-stm/strict-stm.cabal | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/io-classes/io-classes.cabal b/io-classes/io-classes.cabal index 355fd637..ceff240c 100644 --- a/io-classes/io-classes.cabal +++ b/io-classes/io-classes.cabal @@ -12,7 +12,7 @@ maintainer: category: Control build-type: Simple cabal-version: >=1.10 -tested-with: GHC == 8.10.7, GHC == 9.2.5, GHC == 9.4.3 +tested-with: GHC == 8.10.7, GHC == 9.2.5, GHC == 9.4.4 source-repository head type: git diff --git a/io-sim/io-sim.cabal b/io-sim/io-sim.cabal index ffca1c38..973cec95 100644 --- a/io-sim/io-sim.cabal +++ b/io-sim/io-sim.cabal @@ -12,7 +12,7 @@ author: Duncan Coutts, Marcin Szamotulski, Alexander Vieth maintainer: category: Testing build-type: Simple -tested-with: GHC == 8.10.7, GHC == 9.2.5, GHC == 9.4.3 +tested-with: GHC == 8.10.7, GHC == 9.2.5, GHC == 9.4.4 flag asserts description: Enable assertions diff --git a/strict-stm/strict-stm.cabal b/strict-stm/strict-stm.cabal index 30258e49..30c23419 100644 --- a/strict-stm/strict-stm.cabal +++ b/strict-stm/strict-stm.cabal @@ -14,7 +14,7 @@ author: Alexander Vieth, Marcin Szamotulski, Duncan Coutts maintainer: category: Control build-type: Simple -tested-with: GHC == 8.10.7, GHC == 9.2.5, GHC == 9.4.3 +tested-with: GHC == 8.10.7, GHC == 9.2.5, GHC == 9.4.4 source-repository head type: git From 50785256e94a3ac67b4396463089e89c7f244047 Mon Sep 17 00:00:00 2001 From: Duncan Coutts Date: Mon, 13 Mar 2023 15:24:32 +0000 Subject: [PATCH 4/4] Update copyright holder IOHK -> IOG Co-authored-by: Marcin Szamotulski --- io-classes/io-classes.cabal | 2 +- io-sim/NOTICE | 2 +- io-sim/io-sim.cabal | 2 +- strict-stm/NOTICE | 2 +- strict-stm/strict-stm.cabal | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/io-classes/io-classes.cabal b/io-classes/io-classes.cabal index ceff240c..6da3420c 100644 --- a/io-classes/io-classes.cabal +++ b/io-classes/io-classes.cabal @@ -6,7 +6,7 @@ license: Apache-2.0 license-files: LICENSE NOTICE -copyright: 2019-2023 Input Output (Hong Kong) Ltd. +copyright: 2019-2023 Input Output Global Inc (IOG) author: Alexander Vieth, Marcin Szamotulski, Duncan Coutts maintainer: category: Control diff --git a/io-sim/NOTICE b/io-sim/NOTICE index 2787a02a..acd2b2cd 100644 --- a/io-sim/NOTICE +++ b/io-sim/NOTICE @@ -1,4 +1,4 @@ -Copyright 2019-2023 Input Output (Hong Kong) Ltd. +Copyright 2019-2023 Input Output Global Inc (IOG) Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/io-sim/io-sim.cabal b/io-sim/io-sim.cabal index 973cec95..0a9885fb 100644 --- a/io-sim/io-sim.cabal +++ b/io-sim/io-sim.cabal @@ -7,7 +7,7 @@ license: Apache-2.0 license-files: LICENSE NOTICE -copyright: 2019-2023 Input Output (Hong Kong) Ltd. +copyright: 2019-2023 Input Output Global Inc (IOG) author: Duncan Coutts, Marcin Szamotulski, Alexander Vieth maintainer: category: Testing diff --git a/strict-stm/NOTICE b/strict-stm/NOTICE index 2787a02a..acd2b2cd 100644 --- a/strict-stm/NOTICE +++ b/strict-stm/NOTICE @@ -1,4 +1,4 @@ -Copyright 2019-2023 Input Output (Hong Kong) Ltd. +Copyright 2019-2023 Input Output Global Inc (IOG) Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/strict-stm/strict-stm.cabal b/strict-stm/strict-stm.cabal index 30c23419..4250adc2 100644 --- a/strict-stm/strict-stm.cabal +++ b/strict-stm/strict-stm.cabal @@ -9,7 +9,7 @@ license: Apache-2.0 license-files: LICENSE NOTICE -copyright: 2019-2023 Input Output (Hong Kong) Ltd. +copyright: 2019-2023 Input Output Global Inc (IOG) author: Alexander Vieth, Marcin Szamotulski, Duncan Coutts maintainer: category: Control