From 25eeaea7efda05b0ffbd277fb077a1c9eb4f5225 Mon Sep 17 00:00:00 2001
From: Jacek Lebioda <jacek.lebioda@uni.lu>
Date: Wed, 25 Mar 2020 13:36:16 +0100
Subject: [PATCH] fix: corrected paths, moved configs to .ci
---
_config_devel.yml => .ci/_config_devel.yml | 0
_config_master.yml => .ci/_config_master.yml | 0
.gitlab-ci.yml | 9 +++++----
3 files changed, 5 insertions(+), 4 deletions(-)
rename _config_devel.yml => .ci/_config_devel.yml (100%)
rename _config_master.yml => .ci/_config_master.yml (100%)
diff --git a/_config_devel.yml b/.ci/_config_devel.yml
similarity index 100%
rename from _config_devel.yml
rename to .ci/_config_devel.yml
diff --git a/_config_master.yml b/.ci/_config_master.yml
similarity index 100%
rename from _config_master.yml
rename to .ci/_config_master.yml
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 134ec634..2af79c00 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -19,16 +19,17 @@ build_pages:
- gem install bundler:$BUNDLER_VERSION && bundle install
script:
# Generate the configuration for forks (will use Gitlab Pages on personal namespaces)
- - 'echo "url: https://$CI_PROJECT_NAMESPACE.$CI_PAGES_DOMAIN\nbaseurl: /$CI_PROJECT_NAME" >> _config_gitlab_pages.yml'
+ - 'echo "url: https://$CI_PROJECT_NAMESPACE.$CI_PAGES_DOMAIN" >> .ci/_config_gitlab_pages.yml'
+ - 'echo "baseurl: /$CI_PROJECT_NAME" >> .ci/_config_gitlab_pages.yml'
# If there is no config for the current branch, use the one for Gitlab Pages
- - 'if [ ! -f "_config_$CI_COMMIT_REF_NAME.yml" ]; then mv _config_gitlab_pages.yml _config_$CI_COMMIT_REF_NAME.yml; fi'
+ - 'if [ ! -f ".ci/_config_$CI_COMMIT_REF_NAME.yml" ]; then mv .ci/_config_gitlab_pages.yml .ci/_config_$CI_COMMIT_REF_NAME.yml; fi'
# Display, which configuration is used
- - 'echo "Configuration: " && cat "_config_$CI_COMMIT_REF_NAME.yml"'
+ - 'echo "Configuration: " && cat ".ci/_config_$CI_COMMIT_REF_NAME.yml"'
# Run Jekyll with custom configuration
- - bundle exec jekyll build -d build --config "_config.yml,_config_$CI_COMMIT_REF_NAME.yml"
+ - bundle exec jekyll build -d build --config "_config.yml,.ci/_config_$CI_COMMIT_REF_NAME.yml"
generate the search index:
--
GitLab