Merge branch 'dev' into 213-dev-implement-json-errors

.gitlab-ci.yml

@@ -14,9 +14,9 @@ variables:
 
 stages:
   - deps
-  - cabal
   - test
   - docs
+  - cabal
 
 deps:
   stage: deps
@@ -24,14 +24,13 @@ deps:
     # cache per branch name
     # key: ${CI_COMMIT_REF_SLUG}
     paths:
-      - /nix
-      - .stack
       - .stack-root/
       - .stack-work/
       - target
   script:
     - echo "Building the project from '$CI_PROJECT_DIR'"
-    - nix-shell && export LC_ALL=C.UTF-8 && stack -v build --no-terminal --haddock --no-haddock-deps --only-dependencies --fast
+    - hpack
+    - nix-shell --run "LC_ALL=C.UTF-8 stack build --no-terminal --haddock --no-haddock-deps --only-dependencies --fast"
 
 docs:
   stage: docs
@@ -39,18 +38,18 @@ docs:
     # cache per branch name
     # key: ${CI_COMMIT_REF_SLUG}
     paths:
-      - /nix
-      - .stack
       - .stack-root/
       - .stack-work/
       - target
   script:
-    - nix-shell && export LC_ALL=C.UTF-8 && stack build --no-terminal --haddock --no-haddock-deps --fast
+    - hpack
+    - nix-shell --run "LC_ALL=C.UTF-8 stack build --no-terminal --haddock --no-haddock-deps --fast"
     - cp -R "$(stack path --local-install-root)"/doc ./output
   artifacts:
     paths:
       - ./output
     expire_in: 1 week
+  allow_failure: true
 
 test:
   stage: test
@@ -58,13 +57,12 @@ test:
     # cache per branch name
     # key: ${CI_COMMIT_REF_SLUG}
     paths:
-      - /nix
-      - .stack
       - .stack-root/
       - .stack-work/
       - target
   script:
-    - nix-shell && export LC_ALL=C.UTF-8 && stack test --no-terminal --fast
+    - hpack
+    - nix-shell --run "LC_ALL=C.UTF-8 stack test --no-terminal --fast"
 
       # TOOO
 
@@ -74,13 +72,12 @@ cabal:
     # cache per branch name
     # key: ${CI_COMMIT_REF_SLUG}
     paths:
-      - /nix
-      - .stack
       - .stack-root/
       - .stack-work/
-      - .local/
-      - .cabal/
+      - dist-newstyle/
       - target
   script:
-    - nix-shell && export LC_ALL=C.UTF-8 && hpack && cabal v2-build --dry-run
+    - hpack
+    - nix-shell --run "LC_ALL=C.UTF-8 cabal v2-update 'hackage.haskell.org,2023-04-07T08:35:43Z' && cabal v2-build --dry-run"
+  allow_failure: true
 

CHANGELOG.md

+## Version 0.0.6.9.9.5.4
+
+* [BACK][FIX][Ngrams Status change (#217)](https://gitlab.iscpif.fr/gargantext/haskell-gargantext/issues/217)
+
+## Version 0.0.6.9.9.5.3
+
+* [BACK][ADM/CI][Docker image with nix (#188)](https://gitlab.iscpif.fr/gargantext/haskell-gargantext/issues/188)
+* [FRONT][FEAT/ERGO][[Home instances blocks] Add a log out action and picto in each instance block header (same action that is in the log in/log out modal) (#552)](https://gitlab.iscpif.fr/gargantext/purescript-gargantext/issues/552)
+* [FRONT][FIX/REVERT][[Term table] Add term should not be suggested when term is already added (#544)](https://gitlab.iscpif.fr/gargantext/purescript-gargantext/issues/544)
+
 ## Version 0.0.6.9.9.5.2
 
 * [FRONT][FIX][Doc View, ngrams selected: children of grouped terms are not shown (#551)](https://gitlab.iscpif.fr/gargantext/purescript-gargantext/issues/551)

devops/docker/Dockerfile

@@ -31,6 +31,7 @@ RUN apt-get update && \
       locales \
       lsb-release \
       software-properties-common \
+      strace \
       sudo \
       wget \
       vim \
@@ -46,7 +47,7 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 
 RUN set -o pipefail && \
     bash <(curl -L https://releases.nixos.org/nix/nix-2.15.0/install) --no-daemon && \
-    locale-gen en_US.UTF-8
+    locale-gen en_US.UTF-8 && chown root -R /nix
 
 ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8'
 ENV USER=root

gargantext.cabal

@@ -5,7 +5,7 @@ cabal-version: 1.12
 -- see: https://github.com/sol/hpack
 
 name:           gargantext
-version: 0.0.6.9.9.5.2
+version: 0.0.6.9.9.5.4
 synopsis:       Search, map, share
 description:    Please see README.md
 category:       Data

package.yaml

@@ -6,7 +6,7 @@ name: gargantext
 #         | | | +-----  Layers * : New versions with API additions
 #         | | | | +---  Layers * : New versions without API breaking changes
 #         | | | | |
-version: '0.0.6.9.9.5.2'
+version: '0.0.6.9.9.5.4'
 synopsis: Search, map, share
 description: Please see README.md
 category: Data