diff options
| -rw-r--r-- | doc/releases.md | 5 | ||||
| -rw-r--r-- | lib/tasks/release.rake | 11 |
2 files changed, 5 insertions, 11 deletions
diff --git a/doc/releases.md b/doc/releases.md index 1b024a73..8b000a11 100644 --- a/doc/releases.md +++ b/doc/releases.md @@ -166,11 +166,14 @@ To create the release merge request for the release: ``` 1. Edit `latest.Dockerfile` by removing the oldest version, and then adding the newest version to the top of the list. +1. Open [`.gitlab/ci/docker-images.gitlab-ci.yml`](../.gitlab/ci/docker-images.gitlab-ci.yml) + and edit the `test:image:docs-single:` job to change the `GITLAB_VERSION` variable. + Set it to the version number of the release you're releasing. 1. Commit and push to create the merge request. For example: ```shell - git add content/_data/versions.yaml content/versions.json latest.Dockerfile + git add .gitlab/ci/docker-images.gitlab-ci.yml content/_data/versions.yaml content/versions.json latest.Dockerfile git commit -m "Release 15.0" git push origin release-15-0 ``` diff --git a/lib/tasks/release.rake b/lib/tasks/release.rake index fb3fea4d..7e400000 100644 --- a/lib/tasks/release.rake +++ b/lib/tasks/release.rake @@ -47,17 +47,8 @@ namespace :release do post.puts content end - # Update GitLab version variable in .gitlab/ci/docker-images.gitlab-ci.yml - ci_yaml = ".gitlab/ci/docker-images.gitlab-ci.yml" - ci_yaml_content = File.read(ci_yaml) - ci_yaml_content.gsub!(/GITLAB_VERSION: \S+/, "GITLAB_VERSION: '#{version}'") - - File.open(ci_yaml, 'w') do |post| - post.puts ci_yaml_content - end - # Add and commit - `git add .gitlab/ci/docker-images.gitlab-ci.yml #{version}.Dockerfile` + `git add #{version}.Dockerfile` `git commit -m 'Release cut #{version}'` puts "\n#{TaskHelpers::COLOR_CODE_GREEN}INFO: Created new Dockerfile:#{TaskHelpers::COLOR_CODE_RESET} #{dockerfile}." |