From 413de6a9b3b2860d0f0947dd7cb9a51d09c20d02 Mon Sep 17 00:00:00 2001
From: jekyllbot <jekyllbot@users.noreply.github.com>
Date: Sat, 6 Jan 2018 09:39:48 -0500
Subject: [PATCH] Display latest version in header (#6676)

Merge pull request 6676
---
 docs/_config.yml           |  1 +
 docs/_includes/header.html |  2 +-
 rake/site.rake             | 12 ++++++++----
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/docs/_config.yml b/docs/_config.yml
index 8ce43989..e91ae126 100644
--- a/docs/_config.yml
+++ b/docs/_config.yml
@@ -1,6 +1,7 @@
 sass:
   style: compressed
 
+version: 3.7.0 # latest version displayed in header
 gauges_id: 503c5af6613f5d0f19000027
 google_analytics_id: UA-50755011-1
 google_site_verification: onQcXpAvtHBrUI5LlroHNE_FP0b2qvFyPq7VZw36iEY
diff --git a/docs/_includes/header.html b/docs/_includes/header.html
index b289550d..418e04d5 100644
--- a/docs/_includes/header.html
+++ b/docs/_includes/header.html
@@ -17,7 +17,7 @@
     <div class="meta hide-on-mobiles">
       <ul>
         <li>
-          <a href="{{ site.repository }}/releases/tag/v{{ jekyll.version }}">v{{ jekyll.version }}</a>
+          <a href="{{ site.repository }}/releases/tag/v{{ site.version }}">v{{ site.version }}</a>
         </li>
         <li>
           <a href="{{ site.repository }}">GitHub</a>
diff --git a/rake/site.rake b/rake/site.rake
index d260e447..05be2f7f 100644
--- a/rake/site.rake
+++ b/rake/site.rake
@@ -7,7 +7,7 @@
 #############################################################################
 
 namespace :site do
-  task :generated_pages => [:history, :version_file, :conduct, :contributing, :support]
+  task :generated_pages => [:history, :latest_version, :conduct, :contributing, :support]
 
   desc "Generate and view the site locally"
   task :preview => :generated_pages do
@@ -84,9 +84,13 @@ namespace :site do
     siteify_file(".github/SUPPORT.markdown", "title" => "Support")
   end
 
-  desc "Write the site latest_version.txt file"
-  task :version_file do
-    File.open("#{docs_folder}/latest_version.txt", "wb") { |f| f.puts(version) } unless version =~ %r!(beta|rc|alpha)!i
+  desc "Write the latest Jekyll version"
+  task :latest_version do
+    return if version =~ %r!(beta|rc|alpha)!i
+    config_file = File.join(docs_folder, "_config.yml")
+    contents = File.read(config_file)
+    File.write(config_file, contents.sub(%r!(?:version\s*:\s+)(.+)!, "version: #{version}"))
+    File.open("#{docs_folder}/latest_version.txt", "wb") { |f| f.puts(version) }
   end
 
   namespace :releases do