Verified Commit 26618bea authored by Przemyslaw Kaminski's avatar Przemyslaw Kaminski

Merge branch 'dev' into dev-deps-fixes

parents 8f54921e 5d0a668d
Pipeline #5405 passed with stages
in 86 minutes and 29 seconds
## Version 0.0.6.9.9.9.4.1
* [BACK][FIX] Deps and build
## Version 0.0.6.9.9.9.4
* [FRONT][FIX][[Docs View] Highlight sometimes broken (#598)](https://gitlab.iscpif.fr/gargantext/purescript-gargantext/issues/598)
......
......@@ -11,18 +11,18 @@ 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="2f4a78e2c740f48928f9953c49776d068e68cbc9cd5d0a5577c90dabac6e12c6"
expected_cabal_project_freeze_hash="8b92667f8d1aac285675108a2b87484adbd9ad7c85679db0ec3d448e32cc6348"
expected_cabal_project_hash="f2efe6832145c093cfe16832b17b06cd4e2d94e85dd0390e713c46c40ee9e461"
expected_cabal_project_freeze_hash="796f0109611f3381278b1885ae1fa257c4177b99885eb04701938f1107c06ee5"
cabal --store-dir=$STORE_DIR v2-update 'hackage.haskell.org,2023-06-24T21:28:46Z'
cabal --store-dir=$STORE_DIR v2-update 'hackage.haskell.org,2023-11-23T20:05:40Z'
# Install stack2cabal if it can't be found.
if ! stack2cabal --help &> /dev/null
then
echo "stack2cabal could not be found"
cabal --store-dir=$STORE_DIR v2-install --index-state="2023-06-24T21:28:46Z" stack2cabal-1.0.14 --overwrite-policy=always
cabal --store-dir=$STORE_DIR v2-install --index-state="2023-11-23T20:05:40Z" stack2cabal-1.0.14 --overwrite-policy=always
fi
stack2cabal --no-run-hpack -p '2023-06-24 21:28:46'
stack2cabal --no-run-hpack -p '2023-11-23 20:05:40'
actual_cabal_project_hash=$(sha256sum cabal.project | awk '{printf "%s",$1}')
actual_cabal_project_freeze_hash=$(sha256sum cabal.project.freeze | awk '{printf "%s",$1}')
......
-- Generated by stack2cabal
index-state: 2023-06-24T21:28:46Z
index-state: 2023-11-23T20:05:40Z
with-compiler: ghc-8.10.7
......
......@@ -1502,7 +1502,7 @@ constraints: any.AC-Angle ==1.0,
any.logging-effect ==1.3.12,
any.logging-facade ==0.3.1,
any.logging-facade-syslog ==1,
any.logict ==0.7.1.0,
any.logict ==0.8.0.0,
any.logstash ==0.1.0.3,
any.loop ==0.3.0,
any.lrucache ==1.2.0.1,
......
......@@ -5,7 +5,7 @@ cabal-version: 2.0
-- see: https://github.com/sol/hpack
name: gargantext
version: 0.0.6.9.9.9.4
version: 0.0.6.9.9.9.4.1
synopsis: Search, map, share
description: Please see README.md
category: Data
......@@ -426,7 +426,7 @@ library
, conduit-extra ^>= 1.3.5
, containers ^>= 0.6.5.1
, contravariant ^>= 1.5.5
, crawlerArxiv
, crawlerArxiv
, crawlerHAL
, crawlerISTEX
, crawlerIsidore
......@@ -536,7 +536,7 @@ library
, servant-server ^>= 0.18.3
, servant-swagger ^>= 1.1.10
, servant-swagger-ui ^>= 0.3.5.3.5.0
, servant-xml-conduit == 0.1.0.4
, servant-xml-conduit >= 0.1.0.4
, simple-reflect ^>= 0.3.3
, singletons ^>= 2.7
, split ^>= 0.2.3.4
......
......@@ -131,6 +131,7 @@ extra-deps:
- json-stream-0.4.2.4@sha256:8b7f17d54a6e1e6311756270f8bcf51e91bab4300945400de66118470dcf51b9,4716
- located-base-0.1.1.1@sha256:7c6395f2b6fbf2d5f76c3514f774423838c0ea94e1c6a5530dd3c94b30c9d1c8,1904
- logging-effect-1.3.12@sha256:72d168dd09887649ba9501627219b6027cbec2d5541931555b7885b133785ce3,1679
- logict-0.8.0.0
- monad-logger-aeson-0.2.0.0
- monoid-extras-0.5.1@sha256:438dbfd7b4dce47d8f0ca577f56caf94bd1e21391afa545cad09fe7cf2e5793d,2333
- rake-0.0.1@sha256:3380f6567fb17505d1095b7f32222c0b631fa04126ad39726c84262da99c08b3,2025
......
......@@ -2,6 +2,7 @@
URL = http://localhost
BACKEND_NAME = localhost
URL_BACKEND_API = http://localhost:8008/api/v1.0
EPO_API_URL = ""
MASTER_USER = gargantua
SECRET_KEY = test_key
DATA_FILEPATH = ~/.garg
......
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