Align version with 7.0/7.0.0

Author: StuartWheater

.Rbuildignore

@@ -17,8 +17,8 @@
 ^R/secure.global.ranking.md$
 ^_pkgdown\.yml$
 ^docs$
-^dsBase_7.0-dev-feat_performance\.tar\.gz$
-^dsBase_7.0-dev-feat_performance-permissive\.tar\.gz$
+^dsBase_7.0.0\.tar\.gz$
+^dsBase_7.0.0-permissive\.tar\.gz$
 ^dsDanger_6.3.4.tar.gz$
 ^\.circleci$
 ^\.circleci/config\.yml$

.github/workflows/dsBaseClient_test_suite.yaml

@@ -139,7 +139,7 @@ jobs:
       - name: Install dsBase to Armadillo
         run: |
           curl -u admin:admin -X GET http://localhost:8080/packages
-          curl -u admin:admin -H 'Content-Type: multipart/form-data' -F "file=@dsBase_7.0.0.9000-permissive.tar.gz" -X POST http://localhost:8080/install-package
+          curl -u admin:admin -H 'Content-Type: multipart/form-data' -F "file=@dsBase_7.0.0-permissive.tar.gz" -X POST http://localhost:8080/install-package
           sleep 60
           docker restart dsbaseclient-armadillo-1
           sleep 30

armadillo_azure-pipelines.yml

@@ -58,10 +58,10 @@ schedules:
       - master
     always: true
   - cron: "0 2 * * *"
-    displayName: Nightly build - v7.0-dev-feat/performance
+    displayName: Nightly build - v7.0-dev
     branches:
       include:
-      - v7.0-dev-feat/performance
+      - v7.0-dev
     always: true
 
 #########################################################################################
@@ -235,7 +235,7 @@ jobs:
 
       curl -u admin:admin -X GET http://localhost:8080/packages
 
-      curl -u admin:admin --max-time 300 -v -H 'Content-Type: multipart/form-data' -F "file=@dsBase_7.0-dev-feat_performance-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_7.0.0-permissive.tar.gz" -X POST http://localhost:8080/install-package
       sleep 60
 
       docker container restart dsbaseclient_armadillo_1

azure-pipelines.yml

@@ -44,10 +44,10 @@ schedules:
       - master
     always: true
   - cron: "0 2 * * *"
-    displayName: Nightly build - v7.0-dev-feat/performance
+    displayName: Nightly build - v7.0-dev
     branches:
       include:
-      - v7.0-dev-feat/performance
+      - v7.0-dev
     always: true
 
 #########################################################################################
@@ -216,7 +216,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)"
 
-      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 = '7.0-dev-feat_performance'); 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 = 'v7.0-dev'); opal.logout(opal)"
 
       sleep 60
 

dsBase_7.0-dev-feat_performance-permissive.tar.gz

@@ -58,10 +58,10 @@ schedules:
       - master
     always: true
   - cron: "0 2 * * *"
-    displayName: Nightly build - v7.0-dev-feat/performance
+    displayName: Nightly build - v7.0-dev
     branches:
       include:
-      - v7.0-dev-feat/performance
+      - v7.0-dev
     always: true
 
 #########################################################################################
@@ -235,7 +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)"
 
-      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 = '7.0-dev-feat/performance'); 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 = 'v7.0-dev'); opal.logout(opal)"
 
       sleep 60