Commit 8b108128 authored by Przemyslaw Kaminski's avatar Przemyslaw Kaminski

Merge branch 'dev' into 97-dev-istex-search

parents 9012f930 304a0676
dev 124-dev-corpus-export-csv 131-dev-ngrams-table-db-connection 131-dev-ngrams-table-db-connection-2 141-dev-node-stories-db-optimization 143-dev-ngrams-repo-conflicts 144-NgramsTable_Optim 145-dev-graph-explorer-search-tfidf 145-graphExplorerSearch 149-dev-ngrams-table-sorting-fix 151-dev-pubmed-api-key 155-dev-export-list-as-csv 158-dev-ngrams-table-patch-sync 159-dev-node-story-versions-fix 161-dev-conduit-insert-db-fix 162-dev-ghc-9.4 162-dev-ghc-9.x 162-dev-haskell-9.2 163-dev-patch-fix 164-dev-node-write-analysis 169-dev-docs-uniq-id 169-dev-revert-fix 169-dev-singulars-plurals 169-dev-singulars-plurals-remove-map-list-size 175-dev-doc-table-count 175-dev-doc-table-count-temp 177-welcome-door-to-enter-the-project 177-welcome-door-to-enter-the-project-2 184-dev-add-nlp-to-gargantext-ini 184-dev-add-support-for-multiple-languages-in-ini-file 186-dev-ngrams-score-fixes 190-dev-framecalc-async-fix 191-dev-list-upload-fixes 193-dev-api-query-dev-fix 199-dev-materialized-view-refresh-issue 201-dev-user-pubmed-api-key 203-dev-corpus-json-import 205-dev-ethercalc-codimd-doc-upload 206-dev-phylo 213-dev-implement-json-errors 217-dev-ngrams-patch 224-dev-uniform-ngrams-creation 233-dev-terms-dates 238-dev-async-workers 239-readme-test-reinstall-project-with-cabal-and-update-the-readme-file 239-readme-test-reinstall-project-with-cabal-and-update-the-readme-file-2 242-dev-phylo-websearch 244-dev-cabal-dependencies-versions 244-dev-hal-language-fix-for-abstracts 244-dev-stack2cabal 250-dev-fix-corpus-hyperdata-update 259-dev-security-fixes 260-readme-add-note-about-libraries-devlopment 263-node-content-breadcrumb-display-the-full-path-of-a-node-as-a-breadcrumb-with-each-clickable-parent 272-dev-fixes-for-node-score 274-dev-more-protolude-in-prelude 275-dev-date-split-fix 280-dev-xml-code-cleanup 281-dev-ngrams-fixes 282-dev-db-obfuscation 293-istex-import-changes-in-the-parser-documents-sources-are-wrong-json-from-zip-file 296-api-hal-remove-useless-first-2-characters-before-authors-and-sources 299-corpus-hal-backend-remove-comment-the-hal-all-lang-choice 303-dev-node-story-fixes 303-dev-node-story-refactoring 308-dev-order2 312-dev-export-json-as-zip 312-dev-zip-file-last-modification-time-fix 313-dev-json-csv-import-of-older-ngrams 314-node-phylo-change-the-default-value-of-findancestors-to-false 325-dev-cooc-matrix 327-dev-rewrite-hal-crawler 330-node-terms-institutes-missing-with-hal-request 333-dev-no-html-when-downloading-empty-note 337-node-phylo-export-the-phylo-in-json-and-dot-format 340-graph-gexf-export-on-the-node-tags-add-a-weight-attribute 341-dev-websockets 345-docs-tsv-export-import-check-and-maintain-consistency-between-export-and-import-formats 347-update-gitignore-file 348-csv-tsv-in-all-codebase 357-fix-crawler-istex-host-not-found 360-dev-tsv-test 361-improving-message-error-from-the-tsv-import 376-dev-annuaire-fields 396-dev-team-management 398-dev-ngram-type-parameter 405-dev-lost-password-design 415-dev-user-empty-field 428-dev-profile-img-upload 428-dev-profile-img-upload-2 430-dev-docs-date-filter 438-dev-team-node-creator 443-dev-doc-upload-improvement 445-dev-doc-upload-lang 452-dev-teams-security 465-dev-hyperdata-graph-angle 469-dev-email-change 475-dev-node-team-invite 476-dev-fix-node-story-versions 481-dev-node-calc-upload 497-dev-node-write-selection 506-dev-search-in-tree 506-dev-tree-search-fix 513-dev-pin-tree 548-dev-node-url-share 551-dev-graphql-contexts-ngrams 561-dev-document-date 571-dev-node-corpus-api-search-fixes 571-dev-node-corpus-api-search-fixes-take-2 580-dev-phylo-params 582-dev-node-phylo-init 592-dev-document-upload-abstract 594-dev-ngrams-click-fixes 596-dev-ngrams-initial-sync-fix 600-dev-graphql-error-format 600-dev-invite-and-errors-fixes 600-dev-wip-graphql-error-format 603-dev-istex-zip-file-upload 622-dev-fix-for-first-commit-after-import 97-dev-istex-search adinapoli/developer-guidelines adinapoli/disable-policy-checks adinapoli/drop-servant-static-th adinapoli/fix-broken-dev adinapoli/fix-datafield-instance adinapoli/fix-phylo-types adinapoli/fix-scheduler adinapoli/hotfix-for-datafield-json-instance adinapoli/improve-cabal adinapoli/improve-cabal-ci-caching adinapoli/improve-cabal-old adinapoli/improve-half-words-stemming adinapoli/investigate-issue-192 adinapoli/issue-180-deps-audit adinapoli/issue-182 adinapoli/issue-185-job-api adinapoli/issue-185-job-api-part-2 adinapoli/issue-187-update-haskell-igraph adinapoli/issue-188 adinapoli/issue-198 adinapoli/issue-198-part-2 adinapoli/issue-217 adinapoli/issue-226 adinapoli/issue-250 adinapoli/issue-252 adinapoli/issue-258 adinapoli/issue-258-part-2 adinapoli/issue-259 adinapoli/issue-259-design-1 adinapoli/issue-261 adinapoli/issue-267 adinapoli/issue-267-part-2 adinapoli/issue-267-part-3 adinapoli/issue-271 adinapoli/issue-273 adinapoli/issue-273-part-2 adinapoli/issue-276 adinapoli/issue-279 adinapoli/issue-284 adinapoli/issue-287 adinapoli/issue-290 adinapoli/issue-292 adinapoli/issue-298 adinapoli/issue-301 adinapoli/issue-302 adinapoli/issue-304 adinapoli/issue-307 adinapoli/issue-315 adinapoli/issue-317 adinapoli/issue-319 adinapoli/issue-320 adinapoli/issue-321 adinapoli/issue-324 adinapoli/issue-324-part-2 adinapoli/issue-329 adinapoli/issue-329-hotfix adinapoli/issue-331 adinapoli/issue-335 adinapoli/issue-336 adinapoli/issue-346 adinapoli/issue-349 adinapoli/issue-350 adinapoli/issue-352 adinapoli/issue-355 adinapoli/issue-356 adinapoli/issue-incorrect-pagination adinapoli/issue-ps-632-phylo-unicode adinapoli/mac-fixes adinapoli/more-db-test-coverage adinapoli/phylo-profile-2 adinapoli/phylo-profile-3 adinapoli/profile-to-phylo adinapoli/raw-query-to-pubmed adinapoli/restore-ci adinapoli/switch-hsvm adinapoli/try-stack2cabal adinapoli/upgrade-to-947 dbg-perf-order2-graph debug-nans dev-177-DoorWelcome dev-177-DoorWelcome-v2 dev-250-addChineze dev-593-pubmed-api-key dev-9.0-upgrade dev-Doc dev-bipartite dev-breadcrumbs-fix dev-contributing dev-demo dev-deps-fixes dev-doc dev-epo-integration dev-epo-patents dev-file-missing dev-fix-broken-pure-refactor dev-flake-merge-0.0.7.1 dev-forgot-password dev-gargantext-ini-fix dev-ghc9.2-acc1.3-etc dev-graph-multipartite dev-hackathon-fixes dev-infomap dev-iramuteq dev-merge dev-merge-nix dev-merge-nix-2 dev-merging dev-no-freeze dev-openalex dev-order1-fix dev-order2 dev-phylo dev-phylo-csv-fix dev-phyloDebug dev-prelude-refactoring dev-radical-term-type-rewrite dev-tests-refactor dev-toMerge dev-treedebug dev-typeclasses-refactoring developer-guidelines fix-confluence-indices-bugs fix-haddock-parse-error flake-nix-merge-dev-0.0.7 flexible-job-queue garg-init-errror-msg jobqueue-fairness jobqueue-test-delay master remove-johnsnownlp revert-0b51636b stable subcorpus testing 0.0.7.1.7.3 0.0.7.1.7.2 0.0.7.1.7.1 0.0.7.1.7 0.0.7.1.6.5 0.0.7.1.6.4 0.0.7.1.6.3 0.0.7.1.6.2 0.0.7.1.6.1 0.0.7.1.6 0.0.7.1.5.5 0.0.7.1.5.4 0.0.7.1.5.3 0.0.7.1.5.2 0.0.7.1.5.1 0.0.7.1.5 0.0.7.1.4 0.0.7.1.3 0.0.7.1.2 0.0.7.1.1 0.0.7.1 0.0.7 0.0.6.9.9.9.9.1 0.0.6.9.9.9.9 0.0.6.9.9.9.8.1 0.0.6.9.9.9.8 0.0.6.9.9.9.7.3 0.0.6.9.9.9.7.2.1 0.0.6.9.9.9.7.2 0.0.6.9.9.9.7.1 0.0.6.9.9.9.7 0.0.6.9.9.9.6.7.1 0.0.6.9.9.9.6.7 0.0.6.9.9.9.6.6 0.0.6.9.9.9.6.5.1 0.0.6.9.9.9.6.5 0.0.6.9.9.9.6.4 0.0.6.9.9.9.6.3 0.0.6.9.9.9.6.2 0.0.6.9.9.9.6.1 0.0.6.9.9.9.6 0.0.6.9.9.9.5 0.0.6.9.9.9.4.9.3 0.0.6.9.9.9.4.9.2 0.0.6.9.9.9.4.9.1 0.0.6.9.9.9.4.9 0.0.6.9.9.9.4.8 0.0.6.9.9.9.4.7 0.0.6.9.9.9.4.6 0.0.6.9.9.9.4.5 0.0.6.9.9.9.4.4 0.0.6.9.9.9.4.3 0.0.6.9.9.9.4.2 0.0.6.9.9.9.4.1 0.0.6.9.9.9.4 0.0.6.9.9.9.3.2 0.0.6.9.9.9.3.1 0.0.6.9.9.9.3 0.0.6.9.9.9.2 0.0.6.9.9.9.1 0.0.6.9.9.9 0.0.6.9.9.8.3.4 0.0.6.9.9.8.3.3 0.0.6.9.9.8.3.2 0.0.6.9.9.8.3.1 0.0.6.9.9.8.3 0.0.6.9.9.8.2 0.0.6.9.9.8.1 0.0.6.9.9.8 0.0.6.9.9.7.9 0.0.6.9.9.7.8 0.0.6.9.9.7.7 0.0.6.9.9.7.6.4 0.0.6.9.9.7.6.3 0.0.6.9.9.7.6.2 0.0.6.9.9.7.6.1 0.0.6.9.9.7.6 0.0.6.9.9.7.5.1 0.0.6.9.9.7.5 0.0.6.9.9.7.4 0.0.6.9.9.7.3 0.0.6.9.9.7.2 0.0.6.9.9.7.1 0.0.6.9.9.7 0.0.6.9.9.6.9 0.0.6.9.9.6.8 0.0.6.9.9.6.7 0.0.6.9.9.6.6 0.0.6.9.9.6.5 0.0.6.9.9.6.4 0.0.6.9.9.6.3 0.0.6.9.9.6.2 0.0.6.9.9.6.1 0.0.6.9.9.6 0.0.6.9.9.5.8 0.0.6.9.9.5.7 0.0.6.9.9.5.6 0.0.6.9.9.5.5 0.0.6.9.9.5.4 0.0.6.9.9.5.3 0.0.6.9.9.5.2 0.0.6.9.9.5.1 0.0.6.9.9.5 0.0.6.9.9.4.6 0.0.6.9.9.4.5 0.0.6.9.9.4.4 0.0.6.9.9.4.3 0.0.6.9.9.4.2 0.0.6.9.9.4.1 0.0.6.9.9.4 0.0.6.9.9.3.3 0.0.6.9.9.3.2 0.0.6.9.9.3.1 0.0.6.9.9.3 0.0.6.9.9.2 0.0.6.9.9.1 0.0.6.9.9 0.0.6.9.8.7.1 0.0.6.9.8.7 0.0.6.9.8.6.2 0.0.6.9.8.6.1 0.0.6.9.8.6 0.0.6.9.8.5.1 0.0.6.9.8.5 0.0.6.9.8.4 0.0.6.9.8.3 0.0.6.9.8.2.2 0.0.6.9.8.2.1 0.0.6.9.8.2 0.0.6.9.8.1 0.0.6.9.8 0.0.6.9.7.6 0.0.6.9.7.5 0.0.6.9.7.4 0.0.6.9.7.3 0.0.6.9.7.2 0.0.6.9.7.1 0.0.6.9.7 0.0.6.9.6 0.0.6.9.5 0.0.6.9.4.9 0.0.6.9.4.8 0.0.6.9.4.7 0.0.6.9.4.6 0.0.6.9.4.5 0.0.6.9.4.4 0.0.6.9.4.3 0.0.6.9.4.2 0.0.6.9.4.1 0.0.6.9.4 0.0.6.9.3 0.0.6.9.2 0.0.6.9.1 0.0.6.8.6 0.0.6.8.5.9.4 0.0.6.8.5.9.3 0.0.6.8.5.9.2 0.0.6.8.5.9.1 0.0.6.8.5.9 0.0.6.8.5.8 0.0.6.8.5.7 0.0.6.8.5.6 0.0.6.8.5.5 0.0.6.8.5.4 0.0.6.8.5.3 0.0.6.8.5.2 0.0.6.8.5.1 0.0.6.8.5 0.0.6.8.4 0.0.6.8.3 0.0.6.8.2 0.0.6.8.1 0.0.6.8 0.0.6.7.2 0.0.6.7.1 0.0.6.7 0.0.6.6 0.0.6.5.1 0.0.6.5 0.0.6.4 0.0.6.3 0.0.6.2 0.0.6.1 0.0.6 0.0.5.9.6 0.0.5.9.5 0.0.5.9.4 0.0.5.9.3 0.0.5.9.2 0.0.5.9.1 0.0.5.9 0.0.5.8.9.9 0.0.5.8.9.8 0.0.5.8.9.7 0.0.5.8.9.6 0.0.5.8.9.5 0.0.5.8.9.4 0.0.5.8.9.3
No related merge requests found
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
# #
# #
image: cgenie/stack-build:lts-18.18-garg image: cgenie/stack-build:lts-18.18-garg
#image: cgenie/nixos-stack:latest
variables: variables:
STACK_ROOT: "${CI_PROJECT_DIR}/.stack-root" STACK_ROOT: "${CI_PROJECT_DIR}/.stack-root"
...@@ -21,8 +22,10 @@ docs: ...@@ -21,8 +22,10 @@ docs:
# cache per branch name # cache per branch name
# key: ${CI_COMMIT_REF_SLUG} # key: ${CI_COMMIT_REF_SLUG}
paths: paths:
- .stack
- .stack-root/ - .stack-root/
- .stack-work/ - .stack-work/
- target
script: script:
- stack build --no-terminal --haddock --no-haddock-deps --fast - stack build --no-terminal --haddock --no-haddock-deps --fast
- cp -R "$(stack path --local-install-root)"/doc ./output - cp -R "$(stack path --local-install-root)"/doc ./output
...@@ -36,39 +39,11 @@ test: ...@@ -36,39 +39,11 @@ test:
# cache per branch name # cache per branch name
# key: ${CI_COMMIT_REF_SLUG} # key: ${CI_COMMIT_REF_SLUG}
paths: paths:
- .stack
- .stack-root/ - .stack-root/
- .stack-work/ - .stack-work/
- target
script: script:
- stack test --no-terminal --fast - stack test --no-terminal --fast
# TOOO # TOOO
#unit-test:
# stage: test
# script:
# - make test-unit
#
#int-test:
# stage: test
# script:
# - make test-int
#
#e2e-test:
# stage: test
# script:
# - make test-e2e
#
# If you find yourself with a non-sensical build error when you know your project should be building just fine, this fragment should help:
#
#build:
# stage: build
# script:
# # Clear out cache files
# - rm -rf .stack
# - rm -rf .stack-work
# - stack setup --system-ghc
# - stack install --local-bin-path target --system-ghc
## Version 0.0.4.9.9
* [FIX] Continuous Integration (CI)
## Version 0.0.4.9.8 ## Version 0.0.4.9.8
* [FEAT] All backend routes with clients functions * [FEAT] All backend routes with clients functions
......
name: gargantext name: gargantext
version: '0.0.4.9.8' version: '0.0.4.9.9'
synopsis: Search, map, share synopsis: Search, map, share
description: Please see README.md description: Please see README.md
category: Data category: Data
......
...@@ -14,13 +14,14 @@ docker: ...@@ -14,13 +14,14 @@ docker:
enable: false enable: false
#enable: true #enable: true
repo: 'cgenie/stack-build:lts-18.18-garg' repo: 'cgenie/stack-build:lts-18.18-garg'
#repo: 'cgenie/nixos-stack:latest'
run-args: run-args:
- '--publish=8008:8008' - '--publish=8008:8008'
skip-ghc-check: true skip-ghc-check: true
nix: nix:
enable: true enable: false
add-gc-roots: true add-gc-roots: true
shell-file: nix/stack-shell.nix shell-file: nix/stack-shell.nix
......
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