Merge branch 'update-release-task' into 'master'

Fetch changes of the version branches when updating the dropdowns

See merge request gitlab-org/gitlab-docs!810

1 files changed, 7 insertions, 3 deletions

diff --git a/Rakefile b/Rakefile
index f11c9fb5..210dc932 100644
--- a/Rakefile
+++ b/Rakefile
@@ -189,13 +189,17 @@ namespace :release do
       mr_title = "Update #{version} dropdown to match that of #{current_version}"
       branch_name = "update-#{version.tr('.', '-')}-for-release-#{current_version.tr('.', '-')}"
 
-      puts "Create a new branch off of the online version"
+      puts "=> Create a new branch off of the online version"
       `git checkout -b #{branch_name} #{version}`
 
-      puts "Copy the versions.yaml content from the release-#{current_version} branch"
+      puts "=> Fetch version origin and reset to current"
+      `git fetch origin #{version}`
+      `git reset --hard origin/#{version}`
+
+      puts "=> Copy the versions.yaml content from the release-#{current_version} branch"
       `git checkout release-#{current_version.tr('.', '-')} -- content/_data/versions.yaml`
 
-      puts "Commit and push to create a merge request"
+      puts "=> Commit and push to create a merge request"
       `git commit -m "Update dropdown to #{current_version}"`
       `git push origin #{branch_name} -o merge_request.create -o merge_request.target=#{version} -o merge_request.remove_source_branch -o merge_request.merge_when_pipeline_succeeds -o merge_request.title="#{mr_title}" -o merge_request.label="release"`
     end