aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoris2016-10-30 16:03:57 +0100
committerJoris2016-10-30 16:03:57 +0100
commit42dc61a268ab9df3e0c5384cf850bbe2e872ac23 (patch)
tree8a78ddce8dc9c7d033c5c661d962a28127810515
parentb42fad0e16967923746e932c1be4f038daabd40e (diff)
downloadcooking-42dc61a268ab9df3e0c5384cf850bbe2e872ac23.tar.gz
cooking-42dc61a268ab9df3e0c5384cf850bbe2e872ac23.tar.bz2
cooking-42dc61a268ab9df3e0c5384cf850bbe2e872ac23.zip
Gitlab-ci on demo branch
-rw-r--r--.gitlab-ci.yml16
-rw-r--r--stack.yaml6
2 files changed, 2 insertions, 20 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e232d2e..22a4be4 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,18 +1,6 @@
-image: haskell:7.10.3
-
pages:
- cache:
- paths:
- - _cache
- - .stack
- before_script:
- - export STACK_ROOT=`pwd`/.stack
- - stack install --only-dependencies
- - stack build
- script:
- - stack exec Cooking build
artifacts:
paths:
- - public
+ - public
only:
- - master
+ - demo
diff --git a/stack.yaml b/stack.yaml
deleted file mode 100644
index 4531cf3..0000000
--- a/stack.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-flags: {}
-packages:
-- '.'
-extra-deps: []
-extra-package-dbs: []
-resolver: lts-6.6