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 134ec634a0e72f564fc9ff5d748fb9f450852e4f..2af79c00c69e3c391c73313ac32b0a3ecde879b7 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: