[FABCJ-283] Update docs to handle new branch

Signed-off-by: James Taylor <jamest@uk.ibm.com>

# Conflicts:
#	ci/azure-pipelines.yml

Author: jt-nti

ci/azure-pipelines.yml

@@ -50,9 +50,11 @@ pool:
 stages:
   - stage: Build_and_test
     jobs:
-      - job: main
-        steps:                
+      - job: displayenv
+        steps:
           - template: templates/build-data.yml
+      - job: main
+        steps:
           - task: Gradle@2
             inputs:
               workingDirectory: ""
@@ -117,7 +119,13 @@ stages:
               artifactName: javaenv-docker-image
 
       - job: javadoc
+        dependsOn: displayenv
         condition: and(succeeded(),eq(variables['Build.Reason'], 'IndividualCI'))
+        variables:
+          ${{ if eq(variables['Build.SourceBranch'], 'refs/heads/master') }}:
+            javadoc_release: master
+          ${{ if ne(variables['Build.SourceBranch'], 'refs/heads/master') }}:
+            javadoc_release: release-$(BuildData.MINOR_PACKAGE_VERSION)
         steps:
           - script: ./gradlew javadoc
             displayName: 'Build JavaDoc'
@@ -131,9 +139,9 @@ stages:
           - script: |
               git fetch origin
               git checkout -b gh-pages origin/gh-pages
-              mkdir -p $(Build.SourceBranchName)/api
-              rm -rf $(Build.SourceBranchName)/api/*
-              cp -r fabric-chaincode-shim/build/docs/javadoc/* $(Build.SourceBranchName)/api
+              mkdir -p $(javadoc_release)/api
+              rm -rf $(javadoc_release)/api/*
+              cp -r fabric-chaincode-shim/build/docs/javadoc/* $(javadoc_release)/api
 
               # if the gh-pages is present from the previous script, then copy across the files across.
               if [ -d gh-pages ]; then

ci/templates/build-data.yml

@@ -2,9 +2,15 @@ steps:
 - script: |
     env | sort
     java -version
+    # handle full version number
     VERSION=$(./gradlew -q printVersionName | head -n 1 | cut -d'-' -f1)  
     VERSION=${VERSION// }
     echo Current version in code is :${VERSION}:
     echo "##vso[task.setvariable variable=PACKAGE_VERSION;isOutput=true]${VERSION}"
+    # handle minor version
+    MINOR_VERSION=$(echo $VERSION | sed 's/^\([0-9]\{1,\}\.[0-9]\{1,\}\)\..*/\1/')
+    MINOR_VERSION=${MINOR_VERSION// }
+    echo Current minor version in code is :${MINOR_VERSION}:
+    echo "##vso[task.setvariable variable=MINOR_PACKAGE_VERSION;isOutput=true]${MINOR_VERSION}"
   name: BuildData
   displayName: 'Build data'

docs/_includes/header.html

@@ -3,24 +3,19 @@
   <div class="wrapper">
     <a class="site-title" rel="author" href="{{ "/" | relative_url }}">{{ site.title | escape }}</a>
 
-    {%- assign num_releases = site.releases | size -%}
-    {%- if num_releases > 0 -%}
-      <nav class="site-nav">
-        <input type="checkbox" id="nav-trigger" class="nav-trigger" />
-        <label for="nav-trigger">
-          <span class="menu-icon">
-            <svg viewBox="0 0 18 15" width="18px" height="15px">
-              <path d="M18,1.484c0,0.82-0.665,1.484-1.484,1.484H1.484C0.665,2.969,0,2.304,0,1.484l0,0C0,0.665,0.665,0,1.484,0 h15.032C17.335,0,18,0.665,18,1.484L18,1.484z M18,7.516C18,8.335,17.335,9,16.516,9H1.484C0.665,9,0,8.335,0,7.516l0,0 c0-0.82,0.665-1.484,1.484-1.484h15.032C17.335,6.031,18,6.696,18,7.516L18,7.516z M18,13.516C18,14.335,17.335,15,16.516,15H1.484 C0.665,15,0,14.335,0,13.516l0,0c0-0.82,0.665-1.483,1.484-1.483h15.032C17.335,12.031,18,12.695,18,13.516L18,13.516z"/>
-            </svg>
-          </span>
-        </label>
+    <nav class="site-nav">
+      <input type="checkbox" id="nav-trigger" class="nav-trigger" />
+      <label for="nav-trigger">
+        <span class="menu-icon">
+          <svg viewBox="0 0 18 15" width="18px" height="15px">
+            <path d="M18,1.484c0,0.82-0.665,1.484-1.484,1.484H1.484C0.665,2.969,0,2.304,0,1.484l0,0C0,0.665,0.665,0,1.484,0 h15.032C17.335,0,18,0.665,18,1.484L18,1.484z M18,7.516C18,8.335,17.335,9,16.516,9H1.484C0.665,9,0,8.335,0,7.516l0,0 c0-0.82,0.665-1.484,1.484-1.484h15.032C17.335,6.031,18,6.696,18,7.516L18,7.516z M18,13.516C18,14.335,17.335,15,16.516,15H1.484 C0.665,15,0,14.335,0,13.516l0,0c0-0.82,0.665-1.483,1.484-1.483h15.032C17.335,12.031,18,12.695,18,13.516L18,13.516z"/>
+          </svg>
+        </span>
+      </label>
 
-        <div class="trigger">
-          {%- for release in site.releases -%}
-            <a class="page-link" href="https://github.com/hyperledger/fabric-chaincode-java/tree/{{ release }}">{{ release | escape }}</a>
-          {%- endfor -%}
-        </div>
-      </nav>
-    {%- endif -%}
+      <div class="trigger">
+        <a class="page-link" href="https://github.com/hyperledger/fabric-chaincode-java/">View on GitHub</a>
+      </div>
+    </nav>
   </div>
 </header>