diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 865d8be9..31258517 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -23,6 +23,7 @@
# chck <- rhub::check(devtools::build(), platform = rhub::platforms()[!is.na(rhub::platforms()$`cran-name`), 'name'])
stages:
+ - test
- check
- lint
- website
@@ -53,9 +54,25 @@ before_script:
- echo 'LANG="en_US.utf8"' >> .Renviron
- echo 'LANGUAGE="en_US.utf8"' > ~/.Renviron
+R-release-test-only:
+ stage: test
+ when: always
+ allow_failure: false
+ script:
+ - Rscript -e 'sessionInfo()'
+ # install missing and outdated packages
+ - Rscript -e 'source(".gitlab-ci.R"); gl_update_pkg_all(repos = "https://cran.rstudio.com", quiet = TRUE, install_pkgdown = TRUE, install_lintr = TRUE)'
+ - Rscript -e 'devtools::test(stop_on_failure = FALSE)'
+ cache:
+ key: release_4_0
+ paths:
+ - installed_deps/
+ policy: pull # no uploading after run
+
R-release:
stage: check
- allow_failure: false
+ when: on_success
+ allow_failure: true
script:
- Rscript -e 'sessionInfo()'
# install missing and outdated packages
@@ -80,6 +97,7 @@ R-release:
R-devel:
stage: check
+ when: on_success
image: rocker/r-devel
allow_failure: true
script:
@@ -107,7 +125,7 @@ R-devel:
lintr:
stage: lint
allow_failure: true
- when: on_success
+ when: always
cache:
key: release_4_0
paths:
@@ -122,6 +140,7 @@ lintr:
pages:
stage: website
+ allow_failure: true
when: always
only:
- master
@@ -134,7 +153,7 @@ pages:
codecovr:
stage: coverage
allow_failure: true
- when: on_success
+ when: always
cache:
key: release_4_0
paths:
diff --git a/DESCRIPTION b/DESCRIPTION
index ab32382b..5ec4f71f 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -1,5 +1,5 @@
Package: AMR
-Version: 1.1.0.9000
+Version: 1.1.0.9002
Date: 2020-04-30
Title: Antimicrobial Resistance Analysis
Authors@R: c(
diff --git a/NEWS.md b/NEWS.md
index 208fbcae..7e426054 100755
--- a/NEWS.md
+++ b/NEWS.md
@@ -1,4 +1,4 @@
-# AMR 1.1.0.9000
+# AMR 1.1.0.9002
## Last updated: 30-Apr-2020
### Changed
diff --git a/appveyor.yml b/appveyor.yml
index f7100c88..04de586a 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -51,7 +51,7 @@ matrix:
- R_VERSION: "devel"
build_script:
- - travis_tool.sh clean_library # turn off for caching, turn on for release of new R versions
+ # - travis_tool.sh clean_library # turn off for caching, turn on for release of new R versions
- travis_tool.sh install_deps
test_script:
diff --git a/docs/404.html b/docs/404.html
index 97a8f6b7..0e9338be 100644
--- a/docs/404.html
+++ b/docs/404.html
@@ -81,7 +81,7 @@
NEWS.md
-