Verified Commit e8635fa8 authored by Cody L Marquart's avatar Cody L Marquart
Browse files

Merge branch 'master' into develop

parents ed30d4d2 86fdf86d
......@@ -4,4 +4,5 @@
demo/app/
demo/backup/
^.gitlab-ci.yml
docs/
\ No newline at end of file
docs/
archive/
\ No newline at end of file
......@@ -49,21 +49,31 @@ variables:
check:r-devel:
image: $REG_URL/devel:current
only:
- master
refs:
- master
- tags
<<: *check_template
check:r-oldrelease:
image: $REG_URL/oldrelease:current
only:
- master
refs:
- master
- tags
<<: *check_template
check:r-release:
image: $REG_URL/release:current
only:
refs:
- master
- tags
<<: *check_template
check:r-winbuilder:
stage: checkWindows
image: egruw/r-ftp
only:
- master
refs:
- master
- tags
when: manual
<<: *build_template
script:
......@@ -87,7 +97,7 @@ release:cran:
when: manual
script:
- cat cran-comments.md
- Rscript -e "devtools:::upload_cran(devtools::as.package('.'), './build/${PKG}_${VERSION}.tar.gz')"
- Rscript -e "devtools:::upload_cran(devtools::as.package('.'), './archive/${PKG}_${VERSION}.tar.gz')"
tags:
- docker
allow_failure: false
......@@ -136,8 +146,14 @@ docker:release:
DOCKER_DRIVER: overlay2
DOCKER_TLS_CERTDIR: ""
only:
refs:
- branches
changes:
- "inst/docker/$PKG-$FILE"
except:
refs:
- master
- tags
<<: *docker_template
docker:release-test:
variables:
......@@ -147,9 +163,14 @@ docker:release-test:
DOCKER_DRIVER: overlay2
DOCKER_TLS_CERTDIR: ""
only:
refs:
- branches
changes:
#- ".gitlab-ci.yml"
- "inst/docker/$PKG-$FILE"
except:
refs:
- master
- tags
<<: *docker_template
docker:old-release:
variables:
......@@ -159,8 +180,14 @@ docker:old-release:
DOCKER_DRIVER: overlay2
DOCKER_TLS_CERTDIR: ""
only:
refs:
- branches
changes:
- "inst/docker/$PKG-$FILE"
except:
refs:
- master
- tags
<<: *docker_template
docker:devel:
variables:
......@@ -170,6 +197,12 @@ docker:devel:
DOCKER_DRIVER: overlay2
DOCKER_TLS_CERTDIR: ""
only:
refs:
- branches
changes:
- "inst/docker/$PKG-$FILE"
except:
refs:
- master
- tags
<<: *docker_template
\ No newline at end of file
Package: ncodeR
Title: Techniques for Automated Classifiers
Type: Package
Author: Cody L Marquart [aut, cre], Zachari Swiecki [aut], Brendan Eagan [aut], David Williamson Shaffer [aut]
Author: Cody L Marquart [aut, cre] (<https://orcid.org/0000-0002-3387-6792>), Zachari Swiecki [aut], Brendan Eagan [aut], David Williamson Shaffer [aut]
Authors@R: c(person("Cody L","Marquart", role = c("aut", "cre"), email="cody.marquart@wisc.edu", comment = c(ORCID = "0000-0002-3387-6792")),person("Zachari","Swiecki", role = c("aut"), email="swiecki@wisc.edu"),person("Brendan","Eagan", role = c("aut"), email="beagan@wisc.edu"),person("David", "Williamson Shaffer", role = c("aut"), email = "dws@education.wisc.edu"))
Maintainer: Cody L Marquart <cody.marquart@wisc.edu>
Version: 0.2.0.0
......
......@@ -11,7 +11,7 @@ A set of techniques that can be used to develop, validate, and implement automat
[![build status](https://git.doit.wisc.edu/epistemic-analytics/qe-packages/ncodeR/badges/master/build.svg)](https://git.doit.wisc.edu/epistemic-analytics/qe-packages/ncodeR/commits/master)
[![coverage](https://s3-us-west-2.amazonaws.com/ncoder.qe-libs.org/coverage-master.svg)](http://ncoder.qe-libs.org/coverage/master/index.html)
[![cran status](https://www.r-pkg.org/badges/version-ago/ncodeR)](https://cran.r-project.org/web/packages/ncodeR/index.html)
[![cran status](https://www.r-pkg.org/badges/version-ago/ncodeR)](https://cran.r-project.org/package=ncodeR)
[![cran downloads](https://cranlogs.r-pkg.org/badges/grand-total/ncodeR)](https://cranlogs.r-pkg.org/badges/grand-total/ncodeR)
```
install.packages("ncodeR")
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment