diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0014ea4aa1b3f0d98c094f70e5c7c73986b07bcd..df9850c64f630a72e53003b2812bc0a73d042219 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -84,22 +84,26 @@ build:pages: - .tmp rules: - if: $CI_COMMIT_REF_NAME - - if: $CI_MERGE_REQUEST_ID before_script: - apt-get -qq update - apt-get install -y -qq git-lfs - 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" >> .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 ".ci/_config_$CI_COMMIT_REF_NAME.yml" ]; then mv .ci/_config_gitlab_pages.yml .ci/_config_$CI_COMMIT_REF_NAME.yml; fi' - + - | + if [ $CI_MERGE_REQUEST_ID ]; then + export CI_COMMIT_REF_NAME="develop"; + else + 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 ".ci/_config_$CI_COMMIT_REF_NAME.yml" ]; then + mv .ci/_config_gitlab_pages.yml .ci/_config_$CI_COMMIT_REF_NAME.yml; + fi + fi # Display, which configuration is used - - 'echo "Configuration: " && cat ".ci/_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,.ci/_config_$CI_COMMIT_REF_NAME.yml"