Merge remote-tracking branch 'upstream/master' into v6.1-dev

Author: StuartWheater

DESCRIPTION

@@ -1,6 +1,6 @@
 Package: dsBaseClient
 Title: DataSHIELD Client Functions
-Version: 6.1.0
+Version: 6.0.0
 Author: DataSHIELD Developers <datashield@newcastle.ac.uk>
 Maintainer: DataSHIELD Developers <datashield@newcastle.ac.uk>
 Description: DataSHIELD client functions for the client side.

azure-pipelines.yml

@@ -47,8 +47,7 @@ resources:
     type: github
     endpoint: datashield-testing
     name: datashield/datashield-infrastructure
-    ref: v6.1-dev
-
+    ref: refs/tags/6.0.1
 
 
 #########################################################################################
@@ -93,6 +92,9 @@ jobs:
     # If previous steps have failed then don't run.
   - bash: |
   
+      # Work-around for tempory Bazel's apt repository issue.
+      curl https://bazel.build/bazel-release.pub.gpg | sudo apt-key add -
+
       # Purge the default mysql installed on the VM as it is incompatible with our stuff.
       sudo service mysql stop
       sudo apt-get update

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                 => 'master',
   dsstats_githubusername     => 'datashield',
   dsstats_ref                => '',
   dsgraphics_githubusername  => 'datashield',