Skip to content

haskell-gargantext
haskell-gargantext
Commit f186014b authored by Alfredo Di Napoli's avatar Alfredo Di Napoli Committed by Alfredo Di Napoli
Browse files
Options

Try to fix CI

parent 92d85cb4
Hide whitespace changes
Inline Side-by-side
Showing with 93 additions and 80 deletions
.gitlab-ci.yml
View file @ f186014b
......@@ -26,6 +26,7 @@ stack:
script:
- echo "Building the project from '$CI_PROJECT_DIR'"
- nix-shell --run "stack build --no-terminal --fast --dry-run"
allow_failure: true
cabal:
stage: cabal
......
bin/update-cabal-project
View file @ f186014b
......@@ -11,8 +11,8 @@ STORE_DIR="${1:-$DEFAULT_STORE}"
# `expected_cabal_project_freeze_hash` with the
# `sha256sum` result calculated on the `cabal.project` and `cabal.project.freeze`.
# This ensures the files stay deterministic so that CI cache can kick in.
expected_cabal_project_hash="52c9f9895eea755555fc434657e8bba3f53211c77a24a173da337ee887024854"
expected_cabal_project_freeze_hash="92cba3fe5ddb3e30bf7c3dfbf2470f21da6eceb30f14feea9b70be8257e7cfc4"
expected_cabal_project_hash="18ab030988f53446ea717e1f4c7206fab10494d73c37108eebac78094fbf206b"
expected_cabal_project_freeze_hash="813bbd4fe878104d09b0f2afe46b3e4cef5a541fb1454b965836f2d7a0f0e99e"
cabal --store-dir=$STORE_DIR v2-update 'hackage.haskell.org,2023-12-10T10:34:46Z'
......@@ -20,7 +20,7 @@ cabal --store-dir=$STORE_DIR v2-update 'hackage.haskell.org,2023-12-10T10:34:46Z
if ! stack2cabal --help &> /dev/null
then
echo "stack2cabal could not be found"
cabal --store-dir=$STORE_DIR v2-install --index-state="2023-12-10T10:34:46Z" stack2cabal-1.0.14 --overwrite-policy=always
cabal --store-dir=$STORE_DIR v2-install --index-state="2023-12-10T10:34:46Z" --constraint 'Cabal==3.6.3.0' stack2cabal-1.0.14 --overwrite-policy=always
fi
stack2cabal --no-run-hpack -p '2023-11-23 20:05:40'
......
cabal.project
View file @ f186014b
......@@ -7,11 +7,28 @@ with-compiler: ghc-9.4.7
packages:
./
source-repository-package
type: git
location: https://github.com/AccelerateHS/accelerate.git
tag: 334d05519436bb7f20f9926ec76418f5b8afa359
source-repository-package
type: git
location: https://github.com/AccelerateHS/accelerate-llvm.git
tag: 2b5d69448557e89002c0179ea1aaf59bb757a6e3
subdir: accelerate-llvm-native/
accelerate-llvm/
source-repository-package
type: git
location: https://github.com/adinapoli/boolexpr.git
tag: 91928b5d7f9342e9865dde0d94862792d2b88779
source-repository-package
type: git
location: https://github.com/adinapoli/duckling.git
tag: 23603a832117e5352d5b0fb9bb1110228324b35a
source-repository-package
type: git
location: https://github.com/adinapoli/haskell-opaleye.git
......@@ -19,25 +36,25 @@ source-repository-package
source-repository-package
type: git
location: https://github.com/adinapoli/wikiparsec.git
tag: b3519a0351ae9515497680571f76200c24dedb53
location: https://github.com/adinapoli/llvm-hs.git
tag: 7533a9ccd3bfe77141745f6b61039a26aaf5c83b
subdir: llvm-hs
llvm-hs-pure
source-repository-package
type: git
location: https://github.com/AccelerateHS/accelerate.git
tag: 334d05519436bb7f20f9926ec76418f5b8afa359
location: https://github.com/adinapoli/text16-compat.git
tag: 85533b5d597e6fc5498411b4bcfc76380ec80d71
source-repository-package
type: git
location: https://github.com/alpmestan/accelerate-arithmetic.git
tag: a110807651036ca2228a76507ee35bbf7aedf87a
location: https://github.com/adinapoli/wikiparsec.git
tag: b3519a0351ae9515497680571f76200c24dedb53
source-repository-package
type: git
location: https://github.com/AccelerateHS/accelerate-llvm.git
tag: 2b5d69448557e89002c0179ea1aaf59bb757a6e3
subdir: accelerate-llvm-native/
accelerate-llvm/
location: https://github.com/alpmestan/accelerate-arithmetic.git
tag: a110807651036ca2228a76507ee35bbf7aedf87a
source-repository-package
type: git
......@@ -56,6 +73,11 @@ source-repository-package
tag: bc6ca8058077b0b5702ea4b88bd4189cfcad267a
subdir: sparse-linear
source-repository-package
type: git
location: https://github.com/chessai/eigen.git
tag: 8fff32a43df743c8c83428a86dd566a0936a4fba
source-repository-package
type: git
location: https://github.com/delanoe/data-time-segment.git
......@@ -71,11 +93,6 @@ source-repository-package
location: https://gitlab.iscpif.fr/amestanogullari/accelerate-utility.git
tag: a3875fe652d3bb5acb522674c22c6c814c1b4ad0
source-repository-package
type: git
location: https://gitlab.iscpif.fr/gargantext/patches-class.git
tag: 3668d28607867a88b2dfc62158139b3cfd629ddb
source-repository-package
type: git
location: https://gitlab.iscpif.fr/gargantext/crawlers/arxiv-api.git
......@@ -114,7 +131,7 @@ source-repository-package
source-repository-package
type: git
location: https://gitlab.iscpif.fr/gargantext/gargantext-graph.git
tag: 2cc9f625beb81cd431fc64d902f4572fb3c577db
tag: 588e104fe7593210956610cab0041fd16584a4ce
source-repository-package
type: git
......@@ -143,27 +160,13 @@ source-repository-package
source-repository-package
type: git
location: https://gitlab.iscpif.fr/gargantext/servant-xml-conduit.git
tag: 339fd608341bd2652cf5c0e9e76a3293acffbea6
source-repository-package
type: git
location: https://github.com/robstewart57/rdf4h.git
tag: 4fd2edf30c141600ffad6d730cc4c1c08a6dbce4
source-repository-package
type: git
location: https://github.com/chessai/eigen.git
tag: 8fff32a43df743c8c83428a86dd566a0936a4fba
location: https://gitlab.iscpif.fr/gargantext/patches-class.git
tag: 3668d28607867a88b2dfc62158139b3cfd629ddb
-- llvm-12 with support for GHC 9.4.*
source-repository-package
type: git
location: https://github.com/adinapoli/llvm-hs.git
tag: 7533a9ccd3bfe77141745f6b61039a26aaf5c83b
subdir:
llvm-hs
llvm-hs-pure
location: https://gitlab.iscpif.fr/gargantext/servant-xml-conduit.git
tag: 339fd608341bd2652cf5c0e9e76a3293acffbea6
source-repository-package
type: git
......@@ -172,13 +175,8 @@ source-repository-package
source-repository-package
type: git
location: https://github.com/adinapoli/duckling.git
tag: 23603a832117e5352d5b0fb9bb1110228324b35a
source-repository-package
type: git
location: https://github.com/adinapoli/text16-compat.git
tag: 85533b5d597e6fc5498411b4bcfc76380ec80d71
location: https://github.com/robstewart57/rdf4h.git
tag: 4fd2edf30c141600ffad6d730cc4c1c08a6dbce4
allow-older: *
allow-newer: *
......
cabal.project.freeze
View file @ f186014b
......@@ -751,7 +751,6 @@ constraints: any.AC-Angle ==1.0,
any.dual ==0.1.1.1,
any.dual-tree ==0.2.3.1,
any.dublincore-xml-conduit ==0.1.0.3,
any.duckling ==0.2.0.0,
any.dunai ==0.11.2,
any.duration ==0.2.0.0,
any.dvorak ==0.1.0.0,
......@@ -771,7 +770,6 @@ constraints: any.AC-Angle ==1.0,
any.effectful-core ==2.2.2.2,
any.effectful-plugin ==1.1.0.2,
any.effectful-th ==1.0.0.1,
any.eigen ==3.3.7.0,
any.either ==5.0.2,
any.either-both ==0.1.1.1,
any.either-unwrap ==1.1,
......@@ -852,10 +850,12 @@ constraints: any.AC-Angle ==1.0,
any.fast-logger ==3.2.2,
any.fast-math ==1.0.2,
any.fast-myers-diff ==0.0.0,
any.fast-tagsoup ==1.0.14,
any.fasta ==0.10.4.2,
any.fastmemo ==0.1.1,
any.fb ==2.1.1.1,
any.fcf-family ==0.2.0.0,
any.fclabels ==2.0.5.1,
any.fdo-notify ==0.3.1,
any.feature-flags ==0.1.0.1,
any.fedora-dists ==2.1.1,
......@@ -1003,6 +1003,7 @@ constraints: any.AC-Angle ==1.0,
any.ghc-lib ==9.4.7.20230826,
any.ghc-lib-parser ==9.4.7.20230826,
any.ghc-lib-parser-ex ==9.4.0.0,
any.ghc-parser ==0.2.6.0,
any.ghc-paths ==0.1.0.12,
any.ghc-prof ==1.4.1.12,
any.ghc-syntax-highlighter ==0.0.9.0,
......@@ -1355,6 +1356,7 @@ constraints: any.AC-Angle ==1.0,
any.ieee754 ==0.8.0,
any.if ==0.1.0.0,
any.iff ==0.0.6.1,
any.ihaskell ==0.11.0.0,
any.ihs ==0.1.0.3,
any.imagesize-conduit ==1.1,
any.immortal ==0.3,
......@@ -1538,7 +1540,6 @@ constraints: any.AC-Angle ==1.0,
any.list-transformer ==1.0.9,
any.listsafe ==0.1.0.1,
any.literatex ==0.3.0.0,
any.llvm-hs ==12.0.0,
any.lmdb ==0.2.5,
any.load-env ==0.2.1.0,
any.loc ==0.1.4.1,
......@@ -2268,13 +2269,19 @@ constraints: any.AC-Angle ==1.0,
any.sequence-formats ==1.7.1,
any.sequenceTools ==1.5.3.1,
any.serialise ==0.2.6.0,
any.servant ==0.20.1,
any.servant-auth ==0.4.1.0,
any.servant-auth-client ==0.4.1.1,
any.servant-auth-docs ==0.2.10.0,
any.servant-auth-server ==0.4.8.0,
any.servant-auth-swagger ==0.2.10.2,
any.servant-auth-wordpress ==1.0.0.2,
any.servant-blaze ==0.9.1,
any.servant-cassava ==0.10.2,
any.servant-checked-exceptions ==2.2.0.1,
any.servant-checked-exceptions-core ==2.2.0.1,
any.servant-client ==0.19,
any.servant-client-core ==0.20,
any.servant-conduit ==0.15.1,
any.servant-docs ==0.12,
any.servant-ekg ==0.3.1,
......@@ -2294,6 +2301,7 @@ constraints: any.AC-Angle ==1.0,
any.servant-pipes ==0.15.3,
any.servant-rate-limit ==0.2.0.0,
any.servant-rawm ==1.0.0.0,
any.servant-server ==0.20,
any.servant-static-th ==1.0.0.0,
any.servant-subscriber ==0.7.0.0,
any.servant-swagger ==1.1.11,
......@@ -2372,6 +2380,7 @@ constraints: any.AC-Angle ==1.0,
any.smtp-mail ==0.3.0.0,
any.snap-blaze ==0.2.1.5,
any.snap-core ==1.0.5.1,
any.snap-server ==1.1.2.1,
any.snowflake ==0.1.1.1,
any.socket ==0.8.3.0,
any.socks ==0.6.1,
......
devops/docker/Dockerfile
View file @ f186014b
FROM ubuntu:jammy
FROM ubuntu:noble
## NOTA BENE: In order for this to be built successfully, you have to run ./devops/coreNLP/build.sh first.
......@@ -34,13 +34,13 @@ RUN apt-get update && \
git \
gnupg2 \
libffi-dev \
libffi7 \
libffi8 \
libgmp-dev \
libgmp10 \
libncurses-dev \
libncurses5 \
libncurses6 \
libnuma-dev \
libtinfo5 \
libtinfo6 \
locales \
lsb-release \
software-properties-common \
......@@ -50,7 +50,7 @@ RUN apt-get update && \
vim \
xz-utils \
zlib1g-dev \
openjdk-18-jdk \
openjdk-21-jdk \
unzip && \
apt-get clean && rm -rf /var/lib/apt/lists/* && \
mkdir -m 0755 /nix && groupadd -r nixbld && chown root /nix && \
......
gargantext.cabal
View file @ f186014b
......@@ -498,9 +498,13 @@ library
, monad-logger ^>= 0.3.36
, morpheus-graphql >= 0.17.0 && < 0.25
, morpheus-graphql-app >= 0.17.0 && < 0.25
, morpheus-graphql-client >= 0.17.0 && < 0.25
, morpheus-graphql-code-gen >= 0.17.0 && < 0.25
, morpheus-graphql-code-gen-utils >= 0.17.0 && < 0.25
, morpheus-graphql-core >= 0.17.0 && < 0.25
, morpheus-graphql-server >= 0.17.0 && < 0.25
, morpheus-graphql-subscriptions >= 0.17.0 && < 0.25
, morpheus-graphql-tests >= 0.17.0 && < 0.25
, mtl ^>= 2.2.2
, natural-transformation ^>= 0.4
, network-uri ^>= 2.6.4.1
......
src/Gargantext/Utils/Jobs/Internal.hs
View file @ f186014b
......@@ -20,7 +20,7 @@ import Data.Kind (Type)
import Data.Sequence (Seq)
import qualified Data.Sequence as Seq
import Prelude
import Servant.API
import Servant.API.Alternative
import Gargantext.Utils.Jobs.Map
import Gargantext.Utils.Jobs.Monad
......
stack.yaml
View file @ f186014b
......@@ -6,20 +6,10 @@ flags:
library-only: true
extra-package-dbs: []
skip-ghc-check: true
system-ghc: true
packages:
- .
docker:
enable: false
repo: 'cgenie/stack-build:lts-18.18-garg'
run-args:
- '--publish=8008:8008'
nix:
enable: false
add-gc-roots: true
shell-file: nix/stack-shell.nix
allow-newer: true
extra-deps:
......@@ -95,8 +85,6 @@ extra-deps:
commit: b9fca8beee0f23c17a6b2001ec834d071709e6e7
subdirs:
- packages/base
- git: https://github.com/chessai/eigen.git
commit: 1790fdf9138970dde0dbabf8b270698145a4a88c
- git: https://github.com/adinapoli/llvm-hs.git
commit: 7533a9ccd3bfe77141745f6b61039a26aaf5c83b
subdirs:
......@@ -114,14 +102,13 @@ extra-deps:
- git: https://github.com/adinapoli/text16-compat.git
commit: 85533b5d597e6fc5498411b4bcfc76380ec80d71
# Others dependencies (using stack resolver)
- HSvm-0.1.1.3.22
- KMP-0.2.0.0@sha256:6dfbac03ef00ebd9347234732cb86a40f62ab5a80c0cc6bedb8eb51766f7df28,2562
- MissingH-1.4.3.0@sha256:32f9892ec98cd21df4f4d3ed8d95a3831ae74287ea0641d6f09b2dc6ef061d39,4859
- Unique-0.4.7.8@sha256:9661f45aa31dde119a2114566166ea38b011a45653337045ee4ced75636533c0,2067
- context-0.2.0.0@sha256:6b643adb4a64fe521873d08df0497f71f88e18b9ecff4b68b4eef938e446cfc9,1886
- dependent-sum-0.7.1.0@sha256:0e419237f5b86da3659772afff9cab355c0f8d5b3fdb15a5b30e673d8dc83941,2147
- full-text-search-0.2.1.4@sha256:81f6df3327e5b604f99b15e78635e5d6ca996e504c21d268a6d751d7d131aa36,6032
- fast-tagsoup-1.0.14@sha256:5aacc569a6ab9633077bb181f6bd6a4dde3ebc7a8b844d2fe7b1920a0cf0ba9f,1343
- fclabels-2.0.5.1@sha256:0ec200ff51561ed6ee60fa52d47427cd4bbbb3ace618884465ce2b27840cc1d7,4621
- fullstop-0.1.4@sha256:80a3e382ef53551bb936e7da8b2825621df0ea169af1212debcb0a90010b30c8,2044
- full-text-search-0.2.1.4@sha256:81f6df3327e5b604f99b15e78635e5d6ca996e504c21d268a6d751d7d131aa36,6032
- ghc-parser-0.2.6.0@sha256:0b0cbceb3bd2762cef201dc54ae302d7918bed23b2f85ffd99c1c8b6a9df32b6,1579
- hgal-2.0.0.2@sha256:13d58afd0668b9cb881c612eff8488a0e289edd4bbffa893df4beee60cfeb73b,653
- hsparql-0.3.8
- hspec-2.11.1
......@@ -129,30 +116,44 @@ extra-deps:
- hspec-discover-2.11.1
- hspec-expectations-0.8.3
- hstatistics-0.3.1
- HSvm-0.1.1.3.22
- ihaskell-0.11.0.0
- ipython-kernel-0.11.0.0
- KMP-0.2.0.0@sha256:6dfbac03ef00ebd9347234732cb86a40f62ab5a80c0cc6bedb8eb51766f7df28,2562
- located-base-0.1.1.1@sha256:7c6395f2b6fbf2d5f76c3514f774423838c0ea94e1c6a5530dd3c94b30c9d1c8,1904
- logging-effect-1.3.12@sha256:72d168dd09887649ba9501627219b6027cbec2d5541931555b7885b133785ce3,1679
- logict-0.8.0.0
- MissingH-1.4.3.0@sha256:32f9892ec98cd21df4f4d3ed8d95a3831ae74287ea0641d6f09b2dc6ef061d39,4859
- monad-logger-aeson-0.2.0.0
- morpheus-graphql-0.24.3
- morpheus-graphql-app-0.24.3
- morpheus-graphql-client-0.24.3
- morpheus-graphql-code-gen-0.24.3
- morpheus-graphql-code-gen-utils-0.24.3
- morpheus-graphql-core-0.24.3
- morpheus-graphql-server-0.24.3
- morpheus-graphql-subscriptions-0.24.3
- morpheus-graphql-tests-0.24.3
- rake-0.0.1@sha256:3380f6567fb17505d1095b7f32222c0b631fa04126ad39726c84262da99c08b3,2025
- random-1.2.1
- recover-rtti-0.4.3
- servant-0.20.1
- servant-auth-server-0.4.8.0@sha256:f21b8b6a0a31811f31d9b1c1e8a1ca68a0f470cab4ffe8b9c2a41b7649492bb2,5521
- servant-auth-swagger-0.2.10.2@sha256:eda169d986faf562b6f43ac90d48c4fcf895dc235dd002d523ad582ec9be833f,2909
- servant-client-core-0.20
- servant-ekg-0.3.1@sha256:19bd9dc3943983da8e79d6f607614c68faea4054fb889d508c8a2b67b6bdd448,2203
- servant-flatten-0.2@sha256:276896f7c5cdec5b8f8493f6205fded0cc602d050b58fdb09a6d7c85c3bb0837,1234
- servant-mock-0.8.7@sha256:64cb3e52bbd51ab6cb25e3f412a99ea712c6c26f1efd117f01a8d1664df49c67,2306
- servant-server-0.20
- snap-server-1.1.2.1@sha256:8ea05b9b068c1e86be77073107eadc177d7eec93724963c063877478a062b229,15471
- stemmer-0.5.2@sha256:823aec56249ec2619f60a2c0d1384b732894dbbbe642856d337ebfe9629a0efd,4082
- taggy-0.2.1@sha256:7bc55ddba178971dc6052163597f0445a0a2b5b0ca0e84ce651d53d722e3c265,4662
- taggy-lens-0.1.2@sha256:091ca81d02bd3d7fb493dce0148e1a38f25eb178a1ebd751043a23239e5e3265,3009
- tasty-hspec-1.2.0.3
- tmp-postgres-1.34.1.0
- Unique-0.4.7.8@sha256:9661f45aa31dde119a2114566166ea38b011a45653337045ee4ced75636533c0,2067
- vector-0.12.3.0@sha256:0ae2c1ba86f0077910be242ec6802cc3d7725fe7b2bea6987201aa3737b239b5,7953
- wai-3.2.4
- morpheus-graphql-0.24.3
- morpheus-graphql-app-0.24.3
- morpheus-graphql-core-0.24.3
- morpheus-graphql-server-0.24.3
- morpheus-graphql-subscriptions-0.24.3
# For the graph clustering
ghc-options:
......
test/Test/Utils.hs
View file @ f186014b
......@@ -13,14 +13,14 @@ import Language.Haskell.TH.Quote
import Network.HTTP.Types
import Network.Wai.Test
import Prelude
import qualified Data.Aeson as JSON
import qualified Data.Aeson.KeyMap as KM
import qualified Data.ByteString.Char8 as B
import Test.Hspec.Expectations
import Test.Hspec.Wai
import Test.Hspec.Wai.JSON
import Test.Hspec.Wai.Matcher
import Test.Tasty.HUnit
import qualified Data.Aeson as JSON
import qualified Data.ByteString.Char8 as B
import qualified Data.HashMap.Strict as HM
-- | Marks the input 'Assertion' as pending, by ignoring any exception
-- thrown by it.
......@@ -87,5 +87,5 @@ containsJSON expected = MatchBody matcher
isSubsetOf :: Value -> Value -> Bool
isSubsetOf (Object sub) (Object sup) =
all (\(key, value) -> HM.lookup key sup == Just value) (HM.toList sub)
all (\(key, value) -> KM.lookup key sup == Just value) (KM.toList sub)
isSubsetOf x y = x == y
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment