Merge pull request datashield#601 from StuartWheater/v6.4.0-dev

V6.4.0 dev

Author: StuartWheater

.Rbuildignore

@@ -17,8 +17,8 @@
 ^R/secure.global.ranking.md$
 ^_pkgdown\.yml$
 ^docs$
-^dsBase_6.3.2.tar.gz$
-^dsBase_6.3.2-permissive.tar.gz$
+^dsBase_6.4.0.tar.gz$
+^dsBase_6.4.0-permissive.tar.gz$
 ^dsDanger_6.3.1.tar.gz$
 ^\.circleci$
 ^\.circleci/config\.yml$

armadillo_azure-pipelines.yml

@@ -58,17 +58,10 @@ schedules:
       - master
     always: true
   - cron: "0 2 * * *"
-<<<<<<< HEAD
     displayName: Nightly build - v6.4.0-dev
     branches:
       include:
       - v6.4.0-dev
-=======
-    displayName: Nightly build - v6.3.2-dev
-    branches:
-      include:
-      - v6.3.2-dev
->>>>>>> origin/v6.3.3-dev
     always: true
 
 #########################################################################################
@@ -242,11 +235,7 @@ jobs:
 
       curl -u admin:admin -X GET http://localhost:8080/packages
 
-<<<<<<< HEAD
       curl -u admin:admin --max-time 300 -v -H 'Content-Type: multipart/form-data' -F "file=@dsBase_6.4.0.9000-permissive.tar.gz" -X POST http://localhost:8080/install-package
-=======
-      curl -u admin:admin --max-time 300 -v -H 'Content-Type: multipart/form-data' -F "file=@dsBase_6.3.2-permissive.tar.gz" -X POST http://localhost:8080/install-package
->>>>>>> origin/v6.3.3-dev
       sleep 60
 
       docker container restart dsbaseclient_armadillo_1
@@ -375,11 +364,7 @@ jobs:
   - bash: |
       curl -u admin:admin http://localhost:8080/whitelist
 
-<<<<<<< HEAD
       curl -u admin:admin -v -H 'Content-Type: multipart/form-data' -F "file=@dsDanger_6.4.0.9000.tar.gz" -X POST http://localhost:8080/install-package
-=======
-      curl -u admin:admin -v -H 'Content-Type: multipart/form-data' -F "file=@dsDanger_6.3.2.tar.gz" -X POST http://localhost:8080/install-package
->>>>>>> origin/v6.3.3-dev
 
       docker container restart dsbaseclient_armadillo_1
       sleep 60

azure-pipelines.yml

@@ -233,11 +233,7 @@ jobs:
     # Install dsBase.
     # If previous steps have failed then don't run.
   - bash: |
-<<<<<<< HEAD
-      R -q -e "library(opalr); opal <- opal.login('administrator','datashield_test&', url='https://localhost:8443/', opts = list(ssl_verifyhost=0, ssl_verifypeer=0)); dsadmin.install_github_package(opal, 'dsBase', username = 'datashield', ref = '6.4.0'); opal.logout(opal)"
-=======
       R -q -e "library(opalr); opal <- opal.login(username = 'administrator', password = 'datashield_test&', url = 'https://localhost:8443', opts = list(ssl_verifyhost=0, ssl_verifypeer=0)); opal.put(opal, 'system', 'conf', 'general', '_rPackage'); opal.logout(o)"
->>>>>>> origin/v6.3.3-dev
 
       R -q -e "library(opalr); opal <- opal.login('administrator','datashield_test&', url='https://localhost:8443/', opts = list(ssl_verifyhost=0, ssl_verifypeer=0)); dsadmin.install_github_package(opal, 'dsBase', username = 'datashield', ref = '6.3.2'); opal.logout(opal)"
 

opal_azure-pipelines.yml

@@ -58,17 +58,10 @@ schedules:
       - master
     always: true
   - cron: "0 2 * * *"
-<<<<<<< HEAD
     displayName: Nightly build - v6.4.0-dev
     branches:
       include:
       - v6.4.0-dev
-=======
-    displayName: Nightly build - v6.3.2-dev
-    branches:
-      include:
-      - v6.3.2-dev
->>>>>>> origin/v6.3.3-dev
     always: true
 
 #########################################################################################
@@ -242,11 +235,7 @@ jobs:
   - bash: |
       R -q -e "library(opalr); opal <- opal.login(username = 'administrator', password = 'datashield_test&', url = 'https://localhost:8443', opts = list(ssl_verifyhost=0, ssl_verifypeer=0)); opal.put(opal, 'system', 'conf', 'general', '_rPackage'); opal.logout(o)"
 
-<<<<<<< HEAD
-      R -q -e "library(opalr); opal <- opal.login('administrator','datashield_test&', url='https://localhost:8443/', opts = list(ssl_verifyhost=0, ssl_verifypeer=0)); dsadmin.install_github_package(opal, 'dsBase', username = 'datashield', ref = '6.4.0'); opal.logout(opal)"
-=======
       R -q -e "library(opalr); opal <- opal.login('administrator','datashield_test&', url='https://localhost:8443/', opts = list(ssl_verifyhost=0, ssl_verifypeer=0)); dsadmin.install_github_package(opal, 'dsBase', username = 'datashield', ref = '6.3.2'); opal.logout(opal)"
->>>>>>> origin/v6.3.3-dev
 
       sleep 60