Switch to 6.1

Author: StuartWheater

README.md

@@ -9,9 +9,10 @@ DataSHIELD client side base R library.
 | Branch   | dsBase status | dsBase tests | dsBaseClient status | dsBaseClient tests |
 | -------- | ------------- | ------------ | ------------------- | ------------------ |
 | Master   | [![Build Status](https://dev.azure.com/datashield-testing/datashield/_apis/build/status/datashield.dsBase?branchName=master)](https://dev.azure.com/datashield-testing/datashield/_build/latest?definitionId=1&branchName=master) | | [![Build Status](https://dev.azure.com/datashield-testing/datashield/_apis/build/status/datashield.dsBaseClient?branchName=master)](https://dev.azure.com/datashield-testing/datashield/_build/latest?definitionId=1&branchName=master) | [Tests](https://datashield.github.io/testStatus/dsBaseClient/master/latest/) |
-| v6.0-dev | [![Build Status](https://dev.azure.com/datashield-testing/datashield/_apis/build/status/datashield.dsBase?branchName=v6.0-dev)](https://dev.azure.com/datashield-testing/datashield/_build/latest?definitionId=1&branchName=v6.0-dev) | | [![Build Status](https://dev.azure.com/datashield-testing/datashield/_apis/build/status/datashield.dsBaseClient?branchName=v6.0-dev)](https://dev.azure.com/datashield-testing/datashield/_build/latest?definitionId=1&branchName=v6.0-dev) | [Tests](https://datashield.github.io/testStatus/dsBaseClient/v6.0-dev/latest/) |
-| v6.0.1-dev | [![Build Status](https://dev.azure.com/datashield-testing/datashield/_apis/build/status/datashield.dsBase?branchName=v6.0.1-dev)](https://dev.azure.com/datashield-testing/datashield/_build/latest?definitionId=1&branchName=v6.0.1-dev) | | [![Build Status](https://dev.azure.com/datashield-testing/datashield/_apis/build/status/datashield.dsBaseClient?branchName=v6.0.1-dev)](https://dev.azure.com/datashield-testing/datashield/_build/latest?definitionId=1&branchName=v6.0.1-dev) | [Tests](https://datashield.github.io/testStatus/dsBaseClient/v6.0.1-dev/latest/) |
-| v6.1-dev | [![Build Status](https://dev.azure.com/datashield-testing/datashield/_apis/build/status/datashield.dsBase?branchName=v6.1-dev)](https://dev.azure.com/datashield-testing/datashield/_build/latest?definitionId=1&branchName=v6.1-dev) | [Tests](https://datashield.github.io/testStatus/dsBase/v6.1-dev/latest/) | [![Build Status](https://dev.azure.com/datashield-testing/datashield/_apis/build/status/datashield.dsBaseClient?branchName=v6.1-dev)](https://dev.azure.com/datashield-testing/datashield/_build/latest?definitionId=1&branchName=v6.1-dev) | [Tests](https://datashield.github.io/testStatus/dsBaseClient/v6.1-dev/latest/) |
+| 6.0 | [![Build Status](https://dev.azure.com/datashield-testing/datashield/_apis/build/status/datashield.dsBase?branchName=6.0)](https://dev.azure.com/datashield-testing/datashield/_build/latest?definitionId=1&branchName=6.0) | | [![Build Status](https://dev.azure.com/datashield-testing/datashield/_apis/build/status/datashield.dsBaseClient?branchName=6.0)](https://dev.azure.com/datashield-testing/datashield/_build/latest?definitionId=1&branchName=6.0) | [Tests](https://datashield.github.io/testStatus/dsBaseClient/6.0/latest/) |
+| 6.0.1 | [![Build Status](https://dev.azure.com/datashield-testing/datashield/_apis/build/status/datashield.dsBase?branchName=6.0.1)](https://dev.azure.com/datashield-testing/datashield/_build/latest?definitionId=1&branchName6.0.1) | | [![Build Status](https://dev.azure.com/datashield-testing/datashield/_apis/build/status/datashield.dsBaseClient?branchName=6.0.1)](https://dev.azure.com/datashield-testing/datashield/_build/latest?definitionId=1&branchName=6.0.1) | [Tests](https://datashield.github.io/testStatus/dsBaseClient/6.0.1/latest/) |
+| 6.1 | [![Build Status](https://dev.azure.com/datashield-testing/datashield/_apis/build/status/datashield.dsBase?branchName=6.1)](https://dev.azure.com/datashield-testing/datashield/_build/latest?definitionId=1&branchName=6.1) | [Tests](https://datashield.github.io/testStatus/dsBase/6.1/latest/) | [![Build Status](https://dev.azure.com/datashield-testing/datashield/_apis/build/status/datashield.dsBaseClient?branchName=6.1)](https://dev.azure.com/datashield-testing/datashield/_build/latest?definitionId=1&branchName=6.1) | [Tests](https://datashield.github.io/testStatus/dsBaseClient/6.1/latest/) |
+| v6.2-dev | [![Build Status](https://dev.azure.com/datashield-testing/datashield/_apis/build/status/datashield.dsBase?branchName=v6.2-dev)](https://dev.azure.com/datashield-testing/datashield/_build/latest?definitionId=1&branchName=v6.2-dev) | [Tests](https://datashield.github.io/testStatus/dsBase/v6.2-dev/latest/) | [![Build Status](https://dev.azure.com/datashield-testing/datashield/_apis/build/status/datashield.dsBaseClient?branchName=v6.2-dev)](https://dev.azure.com/datashield-testing/datashield/_build/latest?definitionId=1&branchName=v6.2-dev) | [Tests](https://datashield.github.io/testStatus/dsBaseClient/v6.2-dev/latest/) |
 
 
 [![License](https://img.shields.io/badge/license-GPLv3-blue.svg)](https://www.gnu.org/licenses/gpl-3.0.html)
@@ -32,4 +33,4 @@ Detailed instructions on how to install DataSHIELD are at https://www.datashield
 | obiba CRAN                   | Where you probably should install DataSHIELD from. |
 | releases                     | Stable releases. |
 | master branch                | Mostly in sync with the latest release, changes rarely. |
-| v6.1-dev branch (or similar) | Bleeding edge development. We make no claims that this branch is fully functional at any given time. |
+| v6.2-dev branch (or similar) | Bleeding edge development. We make no claims that this branch is fully functional at any given time. |

azure-pipelines.yml

@@ -48,7 +48,7 @@ resources:
     type: github
     endpoint: datashield-testing
     name: datashield/datashield-infrastructure
-    ref: v6.1-dev
+    ref: 6.1
 
 
 #########################################################################################
@@ -298,7 +298,7 @@ jobs:
   - bash: |
 
       sudo R -q -e 'devtools::install()'
-      sudo R -q -e "library('devtools'); devtools::install_github(repo='datashield/dsDangerClient', ref='v6.1-dev', dependencies = TRUE)"
+      sudo R -q -e "library('devtools'); devtools::install_github(repo='datashield/dsDangerClient', ref='6.1', dependencies = TRUE)"
 
     workingDirectory: $(Pipeline.Workspace)/dsBaseClient
     displayName: 'Install dsDangerClient DataSHIELD package'

azure-pipelines_site-dsdanger.pp

@@ -16,7 +16,7 @@
   remote_mysql   => false,        # There is not a remote mysql server
 
   dsbase_githubusername      => 'datashield',
-  dsbase_ref                 => 'v6.1-dev',
+  dsbase_ref                 => '6.1',
   dsdanger_githubusername    => 'datashield',
-  dsdanger_ref               => 'v6.1-dev'
+  dsdanger_ref               => '6.1'
 }

azure-pipelines_site.pp

@@ -16,7 +16,7 @@
   remote_mysql   => false,        # There is not a remote mysql server
 
   dsbase_githubusername      => 'datashield',
-  dsbase_ref                 => 'v6.1-dev',
+  dsbase_ref                 => '6.1',
   dsdanger_githubusername    => 'datashield',
   dsdanger_ref               => ''
 }