Fix up Nightly Nightly links

Author: jodygarnett

README.md

@@ -144,7 +144,7 @@ process of updating site contents for a stable release.
      maintain_jira:    16819
      ```
 
-### Dev Releases
+### Dev Releases and Main branch
 
 When publishing the first milestone, beta or release candidate for a series:
 
@@ -154,18 +154,22 @@ When publishing the first milestone, beta or release candidate for a series:
    
    Create ``bin/templates/about_XXX.md`` highlighting new features.
      
-2. Update ``_config.yml`` update ``dev_series`` and ``dev_branch``, the matching release announcement post will be used to generate `release/dev/index.html` page.
+2. Update ``_config.yml`` update ``dev_branch`` and ``dev_jira`` the matching release announcement post will be used to generate `release/dev/index.html` page.
 
    ```
-   dev_series:       2.21.x
-   dev_branch:       2.21.x
+   dev_branch:       2.27.x
+   dev_jira:         16884
    ```
+   
+   When `dev_branch` is not ``main`` the build process scan for the latest development release for public testing.
 
 3. Update the `main_series`, and `main_jira` to reflect the new version number for `main` branch, this will be used to generate a placeholder for `release/main/index.html` page.
    ```
-   main_series:       2.22.x
+   main_series       2.28.x
    main_jira:        16829
    ```
+   
+   As the main branch always has the same name ``main_series`` is used to provide the name to use for generating links.
 
 ### Final Release
 
@@ -176,19 +180,23 @@ When creating the final release:
    * Update the `maintain_branch` using the values from `stable`.
    * Update the `stable_branch`.
    
-2. Update the `main_series` and `main_series` information. For example, when starting the series `2.22.x`:
+2. Update the `main_series` and `main_jira` information. For example, when starting the series `2.22.x`:
    
    ```
-   main_series:      2.22.x
-   main_jira:        16829_
+   main_series:      2.29.x
+   main_jira:        16829
    ```
+   
+   As the main branch always has the same name ``main_series`` is used to provide the name to use for generating links.
 
-3. The ``dev_series`` and ``dev_branch`` property in ``_config.yml`` to the new series, these will no longer match any posts as the development period is over:
+3. Restore ``dev_branch`` property in ``_config.yml`` to ``main``.
 
    ```
-   dev_series:       main
-   dev_branch:       2.22.x
+   dev_branch:       main
+   dev_jira:         16829
    ```
+   
+   When `dev_branch` is ``main`` the build process will no longer match any posts as the development period is over.
 
 ## Technical Details
 

_config.yml

@@ -11,26 +11,42 @@ nightly_url: https://build.geoserver.org/geoserver
 docs_url:    https://docs.geoserver.org
 url:         https://geoserver.org
 
+##
+## MAIN BRANCH
+##
+
 # latest nightly build
 main_series:      2.27.x
 
 # the next jira release for the main branch
 main_jira:        16936
 
-#dev              determine dev_version
-dev:              2.26.0
-dev_branch:       2.27.x
-dev_series:       2.27.x
-# release candidate, or milestone, if available
-dev_jira:         16936
+##
+## DEVELOPMENT BRANCH
+##
+## This is used during release candidate phase only
+
+# dev             determine nightly build, dev_version
+#                 (When this value is main it is ignored as main is already listed)
+dev_branch:       main
 
+# the next jira release for the dev branch nightly build
+dev_jira:         16884
+
+##
+## STABLE BRANCH
+##
 
 # stable          determine nightly build, stable_version
 stable_branch:    2.26.x
 
 # the next jira release for the stable branch nightly build
 stable_jira:      16940
 
+##
+## MAINTENANCE BRANCH
+#
+
 # maintenance (determine nightly build, maintain_version)
 maintain_branch:  2.25.x
 

_plugins/release.rb

@@ -27,7 +27,7 @@ def generate(site)
       # Can we determine latest stable and maintenance page?
       p 'Review posts to identify latest releases'
       for item in releases
-         if item[0] == site.config['dev_series'].chomp('.x')
+         if item[0] == site.config['dev_branch'].chomp('.x')
            dev_latest = item[1].last
            p '  Identify dev_version=' + dev_latest
            site.config['dev_version'] = dev_latest
@@ -92,7 +92,7 @@ def generate(site)
          dev = NightlyPage.new(
            site, 
            site.config['dev_branch'],
-           site.config['dev_series'][0..-3],
+           site.config['dev_branch'][0..-3],
            'latest',
            site.config['dev_jira']
          )

download/index.html

@@ -185,7 +185,7 @@ <h3>GeoServer Development</h3>
         {%- if site.dev_branch != "main" -%}
           <div class="alert alert-info">
             <p>
-              Nightly builds for the <a href="/release/{{site.dev_branch}}">{{site.dev_series}}</a> series are here: <a class="alert-link" 
+              Nightly builds for the <a href="/release/{{site.dev_branch}}">{{site.dev_branch}}</a> series are here: <a class="alert-link" 
                 href="{{site.nightly_url}}/{{site.dev_branch}}">{{site.dev_branch}}</a>.
             </p>
           </div>

index.html

@@ -118,24 +118,26 @@ <h2><a href="/download">Download</a> <span class="glyphicon glyphicon-download">
             <h4>Stable</h4>
             <ul>
               <li><a href="/release/stable">{{site.stable_version}}</a></li>
-              <li><a href="/release/{{site.stable_branch}}">Nightly</a></li>
+              <li><a href="/release/{{site.stable_branch}}">{{site.stable_branch | slice: 0, 4}} Nightly</a></li>
             </ul>
           </div>
           <div class="col-md-4 download-maintain">
             <h4>Maintenance</h4>
             <ul>
               <li><a href="/release/maintain">{{site.maintain_version}}</a></li>
-              <li><a href="/release/{{site.maintain_branch}}">Nightly</a></li>
+              <li><a href="/release/{{site.maintain_branch}}">{{site.maintain_branch | slice: 0, 4}} Nightly</a></li>
             </ul>
           </div>
           <div class="col-md-4 download-dev">
             <h4>Development</h4>
             <ul>
+            {%- if site.dev_version -%}
               <li id="download_dev_version"><a href="/release/dev">{{site.dev_version}}</a></li>
+            {% endif %}
             {%- if site.dev_branch != 'main' -%}
-              <li><a href="/release/{{site.dev_branch}}">Nightly</a></li>
+              <li><a href="/release/{{site.dev_branch}}">{{site.dev_branch | slice: 0, 4}} Nightly</a></li>
             {% endif %}
-              <li><a href="/release/main">Nightly</a></li>
+              <li><a href="/release/main">{{site.main_series | slice: 0, 4}} Nightly</a></li>
             </ul>
           </div>
         </div>