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

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

parents 9012f930 304a0676
...@@ -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