diff options
| -rw-r--r-- | .gitignore | 3 | ||||
| -rw-r--r-- | .gitlab-ci.yml | 5 | ||||
| -rw-r--r-- | lib/task_helpers.rb | 4 | ||||
| -rw-r--r-- | nanoc.yaml | 8 |
4 files changed, 10 insertions, 10 deletions
@@ -5,15 +5,14 @@ output/ public/ # Make sure the content directories aren't added to the git repo. -content/ce content/ee +content/gitlab content/omnibus content/runner content/charts content/debug content/doc content/docs -content/charts # Temporary file directory tmp/ diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 07ab2922..7db084f4 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -144,8 +144,9 @@ variables: - bundle exec nanoc compile -VV # Symlink all README.html to index.html so that we can have clean URLs - for i in `find public -name README.html`; do ln -sf README.html $(dirname $i)/index.html; done - # Remove CE dir and symlink EE to CE - - if [ $CI_PIPELINE_SOURCE != 'pipeline' ]; then cd public && rm -rf ce && ln -s ee ce && cd ../; fi + # Remove CE/EE dirs and symlink ee/ and ce/ to gitlab/ + - if [ $CI_PIPELINE_SOURCE != 'pipeline' ]; then cd public && rm -rf ce && ln -s gitlab ce && cd ../; fi + - if [ $CI_PIPELINE_SOURCE != 'pipeline' ]; then cd public && rm -rf ee && ln -s gitlab ee && cd ../; fi # Calculate sizes before and after minifying/gzipping the static files (HTML, CSS, JS) - SIZE_BEFORE=$(du -sh public/ | awk '{print $1}') # Minify the assets of the resulting site diff --git a/lib/task_helpers.rb b/lib/task_helpers.rb index 8a8735f5..8d9753a7 100644 --- a/lib/task_helpers.rb +++ b/lib/task_helpers.rb @@ -1,6 +1,6 @@ require 'yaml' -PRODUCTS = %w[ee omnibus runner charts].freeze +PRODUCTS = %w[gitlab omnibus runner charts].freeze VERSION_FORMAT = /^(?<major>\d{1,2})\.(?<minor>\d{1,2})$/.freeze def config @@ -26,7 +26,7 @@ def retrieve_branch(slug) elsif version = ENV["CI_COMMIT_REF_NAME"].match(VERSION_FORMAT) case slug # EE has different branch name scheme - when 'ee' + when 'gitlab' "#{version[:major]}-#{version[:minor]}-stable-ee" when 'omnibus', 'runner' "#{version[:major]}-#{version[:minor]}-stable" @@ -133,17 +133,17 @@ show_banner: false debug: false products: - ee: + gitlab: full_name: 'GitLab' short_name: 'GitLab' - slug: 'ee' + slug: 'gitlab' index_file: 'README.*' img: '/assets/images/docs-gitlab.svg' description: 'Administer and use self-managed GitLab and GitLab.com' repo: 'https://gitlab.com/gitlab-org/gitlab.git' dirs: - temp_dir: 'tmp/ee/' - dest_dir: 'content/ee' + temp_dir: 'tmp/gitlab/' + dest_dir: 'content/gitlab' doc_dir: 'doc' expose: true icon: 'tanuki' |