From 5d7b1cb8928424639814072928f1c412519e865d Mon Sep 17 00:00:00 2001
From: Eliot Berriot <contact@eliotberriot.com>
Date: Sun, 25 Jun 2017 19:13:46 +0200
Subject: [PATCH] Should work now
---
.gitlab-ci.yml | 72 +++++++++++++++++++++++++-------------------------
1 file changed, 36 insertions(+), 36 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c23d1a0309..4a10a92e0d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,41 +1,41 @@
stages:
- test
-# - build
-#
-# test_api:
-# stage: test
-# before_script:
-# - docker-compose -f api/test.yml build
-# script:
-# - docker-compose -f api/test.yml run test
-# after_script:
-# - docker-compose -f api/test.yml run test rm -rf funkwhale_api/media/
-#
-# tags:
-# - dind
-#
-# build_front:
-# stage: build
-# image: node:6-alpine
-# before_script:
-# - cd front
-#
-# script:
-# - npm install
-# - npm run build
-# cache:
-# key: "$CI_COMMIT_REF_NAME"
-# paths:
-# - front/node_modules
-# artifacts:
-# name: "front_${CI_COMMIT_REF_NAME}"
-# paths:
-# - front/dist/
-# only:
-# - master
-# - develop
-# tags:
-# - docker
+ - build
+
+test_api:
+ stage: test
+ before_script:
+ - docker-compose -f api/test.yml build
+ script:
+ - docker-compose -f api/test.yml run test
+ after_script:
+ - docker-compose -f api/test.yml run test rm -rf funkwhale_api/media/
+
+ tags:
+ - dind
+
+build_front:
+ stage: build
+ image: node:6-alpine
+ before_script:
+ - cd front
+
+ script:
+ - npm install
+ - npm run build
+ cache:
+ key: "$CI_COMMIT_REF_NAME"
+ paths:
+ - front/node_modules
+ artifacts:
+ name: "front_${CI_COMMIT_REF_NAME}"
+ paths:
+ - front/dist/
+ only:
+ - master
+ - develop
+ tags:
+ - docker
pages:
--
GitLab