From 1316c7836b8f06f59fb5082413be6ca2188d6110 Mon Sep 17 00:00:00 2001 From: Rob Rix Date: Mon, 4 Mar 2024 12:25:10 -0500 Subject: [PATCH 1/6] Bump hashable's upper bound. --- semantic-source/semantic-source.cabal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/semantic-source/semantic-source.cabal b/semantic-source/semantic-source.cabal index 95153faf79..5e9528fc86 100644 --- a/semantic-source/semantic-source.cabal +++ b/semantic-source/semantic-source.cabal @@ -62,7 +62,7 @@ library , bytestring >= 0.10.8.2 && < 0.13 , deepseq ^>= 1.4.4.0 , containers ^>= 0.6.2 - , hashable >= 1.2.7 && < 1.4 + , hashable >= 1.2.7 && < 1.5 , lingo ^>= 0.5.0.3 , semilattices ^>= 0.0.0.3 , text ^>= 1.2.3.2 From c38cf2b0dce0b0f7d9c864d98ab516dc94f9e3df Mon Sep 17 00:00:00 2001 From: Rob Rix Date: Mon, 4 Mar 2024 12:26:22 -0500 Subject: [PATCH 2/6] Bump. --- semantic-source/semantic-source.cabal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/semantic-source/semantic-source.cabal b/semantic-source/semantic-source.cabal index 5e9528fc86..0d824fe466 100644 --- a/semantic-source/semantic-source.cabal +++ b/semantic-source/semantic-source.cabal @@ -1,7 +1,7 @@ cabal-version: 2.4 name: semantic-source -version: 0.2.0.0 +version: 0.2.0.1 synopsis: Types and functionality for working with source code description: Types and functionality for working with source code (program text). homepage: https://github.com/github/semantic/tree/master/semantic-source#readme From d626acba305a24e7bcae136f0df7007258ae0c64 Mon Sep 17 00:00:00 2001 From: Rob Rix Date: Mon, 4 Mar 2024 12:26:29 -0500 Subject: [PATCH 3/6] Changelog. --- semantic-source/CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/semantic-source/CHANGELOG.md b/semantic-source/CHANGELOG.md index ac941bdcdd..c48da20903 100644 --- a/semantic-source/CHANGELOG.md +++ b/semantic-source/CHANGELOG.md @@ -1,3 +1,8 @@ +# 0.2.0.1 + +- Support ghc 9.4. + + # 0.2.0.0 - Finds languages for `FilePath`s. From 3344fd0ba8b74f5cede08a50373284d42d632ac7 Mon Sep 17 00:00:00 2001 From: Rob Rix Date: Mon, 4 Mar 2024 12:27:43 -0500 Subject: [PATCH 4/6] Extra-doc-files. --- semantic-source/semantic-source.cabal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/semantic-source/semantic-source.cabal b/semantic-source/semantic-source.cabal index 0d824fe466..f0c610fe3f 100644 --- a/semantic-source/semantic-source.cabal +++ b/semantic-source/semantic-source.cabal @@ -14,7 +14,7 @@ copyright: (c) 2020 GitHub, Inc. category: Data build-type: Simple stability: alpha -extra-source-files: +extra-doc-files: CHANGELOG.md README.md From 90475c0d65f3025748decec22b3ac370320ed3db Mon Sep 17 00:00:00 2001 From: Rob Rix Date: Mon, 4 Mar 2024 14:43:52 -0500 Subject: [PATCH 5/6] Deprecation. --- semantic-analysis/src/Analysis/Syntax.hs | 1 - 1 file changed, 1 deletion(-) diff --git a/semantic-analysis/src/Analysis/Syntax.hs b/semantic-analysis/src/Analysis/Syntax.hs index bc31157a0f..7916325284 100644 --- a/semantic-analysis/src/Analysis/Syntax.hs +++ b/semantic-analysis/src/Analysis/Syntax.hs @@ -39,7 +39,6 @@ import Control.Exception import Control.Monad (guard) import Control.Monad.IO.Class import qualified Data.Aeson as A -import qualified Data.Aeson.Internal as A import qualified Data.Aeson.Parser as A import qualified Data.Aeson.Types as A import qualified Data.ByteString.Lazy as B From eb649881d45439ce8d63b7338ef8c4017f497914 Mon Sep 17 00:00:00 2001 From: Rob Rix Date: Wed, 13 Mar 2024 12:54:35 -0400 Subject: [PATCH 6/6] Explicitly configure semantic-source. --- .github/workflows/haskell.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/haskell.yml b/.github/workflows/haskell.yml index 945746d73d..e42629b3be 100644 --- a/.github/workflows/haskell.yml +++ b/.github/workflows/haskell.yml @@ -46,6 +46,7 @@ jobs: run: | cabal v2-update cabal v2-configure --project-file=cabal.project.ci --disable-optimization --enable-tests --write-ghc-environment-files=always -j2 + cd semantic-source && cabal v2-configure --project-file=cabal.project.ci --disable-optimization --enable-tests --write-ghc-environment-files=always -j2 - name: Restore from cache run: ./cabal-cache sync-from-archive --threads=2 --archive-uri=dist-cache || true