From 91598ea6e9bdda7bbd131999abbc4ce06934d3eb Mon Sep 17 00:00:00 2001
From: laurentheirendt <laurent.heirendt@uni.lu>
Date: Mon, 30 Mar 2020 08:53:11 +0200
Subject: [PATCH] change in yml
---
.gitlab-ci.yml | 29 ++++++++++++++++++-----------
1 file changed, 18 insertions(+), 11 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 360cc60..1ad0938 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,6 +1,3 @@
-# In case something goes horribly wrong, you can fall back to `image: ruby:latest`
-image: git-r3lab.uni.lu:4567/r3/docker/jekyll-lcsb:1.4
-
stages:
- index
- build
@@ -16,19 +13,29 @@ index:
# This will try to build the web site, and store the result in "build" directory
build:
+ image: $CI_REGISTRY/r3/docker/jekyll-lcsb:1.4
stage: build
+ rules:
+ - if: $CI_COMMIT_BRANCH == "develop"
+ - if: $CI_COMMIT_BRANCH == "master"
+
variables:
JEKYLL_ENV: production
- artifacts:
- expire_in: 3 days
- paths:
- - build
+
before_script:
- - bundle install
+ - apt-get -qq update
+ - apt-get install -y -qq jq unzip git-lfs
+ - git submodule update --recursive --init
+ - gem install bundler:2.0.2 && bundle install
+
script:
- - 'echo "baseurl: /$CI_PROJECT_NAME" >> _config_ci.yml'
- - 'echo "url: https://$CI_PROJECT_NAMESPACE.$CI_PAGES_DOMAIN" >> _config_ci.yml'
- - bundle exec jekyll build -d build --config "_config.yml,_config_ci.yml"
+ - BASEURL="school/git/basic-practice-pages/";
+ - bundle exec jekyll build --baseurl="$BASEURL" -d build
+
+ artifacts:
+ expire_in: 1 day
+ paths:
+ - build
# This will actually deploy the web site when pushing to master
pages:
--
GitLab