Skip to content

Commit 7365625

Browse files
jangoreckijangorecki
committed
Merge branch 'master' into dllname
2 parents 2763e37 + ba2d7bb commit 7365625

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

84 files changed

+3764
-2254
lines changed

‎.Rbuildignore‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,13 @@
11
^\.Rprofile$
22
^data\.table_.*\.tar\.gz$
33
^vignettes/plots/figures$
4+
^\.Renviron$
5+
^[^/]+\.R$
6+
^[^/]+\.csv$
7+
^[^/]+\.csvy$
8+
^[^/]+\.RDS$
9+
^[^/]+\.diff$
10+
^[^/]+\.patch$
411

512
^\.ci$
613
^\.dev$
@@ -30,3 +37,5 @@
3037

3138
^bus$
3239
^pkgdown$
40+
^lib$
41+
^library$

‎.appveyor.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ environment:
3232

3333
- R_VERSION: release # the single Windows.zip binary (both 32bit/64bit) that users following dev version of installation instructions should click
3434

35-
# - R_VERSION: devel # When off it's to speed up dev cycle; R-devel is still checked but by GLCI on a roughly hourly cycle.
35+
- R_VERSION: devel # When off it's to speed up dev cycle; R-devel is still checked but by GLCI on a roughly hourly cycle. CRAN_Release.cmd has a reminder to turn back on.
3636

3737
before_build:
3838
- cmd: ECHO no Revision metadata added to DESCRIPTION

‎.ci/README.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# data.table continuous integration and deployment
22

3-
On each Pull Request opened in GitHub we run Travis CI and Appveyor to provide prompt feedback about the status of PR. Our main CI pipeline runs on GitLab CI. GitLab repository automatically mirrors our GitHub repository and runs pipeline on `master` branch. It tests more environments and different configurations. It publish variety of artifacts. Windows jobs are being run on our private windows CI runner.
3+
On each Pull Request opened in GitHub we run Travis CI and Appveyor to provide prompt feedback about the status of PR. Our main CI pipeline runs on GitLab CI. GitLab repository automatically mirrors our GitHub repository and runs pipeline on `master` branch. It tests more environments and different configurations. It publish variety of artifacts.
44

55
## Environments
66

@@ -9,7 +9,7 @@ On each Pull Request opened in GitHub we run Travis CI and Appveyor to provide p
99
Test jobs:
1010
- `test-rel-lin` - `r-release` on Linux, most comprehensive test environment, `-O3 -flto -fno-common -Wunused-result`, extra check for no compilation warnings, includes testing [_with other packages_](./../inst/tests/other.Rraw) ([extended suggests](./../inst/tests/tests-DESCRIPTION))
1111
- `test-rel-cran-lin` - `--as-cran` on Linux, `-g0`, extra check for final status of `R CMD check` where we allow one NOTE (_size of tarball_).
12-
- `test-dev-cran-lin` - `r-devel` and `--as-cran` on Linux, `--enable-strict-barrier --disable-long-double`
12+
- `test-dev-cran-lin` - `r-devel` and `--as-cran` on Linux, `--with-recommended-packages --enable-strict-barrier --disable-long-double`, tests for compilation warnings in pkg install and new NOTEs/Warnings in pkg check, and because it is R-devel it is marked as allow_failure
1313
- `test-rel-vanilla-lin` - `r-release` on Linux, no suggested deps, no OpenMP, `-O0`, tracks memory usage during tests
1414
- `test-310-cran-lin` - R 3.1.0 on Linux
1515
- `test-344-cran-lin` - R 3.4.4 on Linux
@@ -27,7 +27,7 @@ Artifacts:
2727
- sources
2828
- Windows binaries for `r-release` and `r-devel`
2929
- [CRAN-like homepage](https://rdatatable.gitlab.io/data.table/web/packages/data.table/index.html)
30-
- [CRAN-like checks results](https://rdatatable.gitlab.io/data.table/web/checks/check_results_data.table.html) - note that all artifacts, including this page, are being published only when all test jobs successfully pass, thus one will not see an _ERROR_ status there (unless `allow_failure` option has been used in a job).
30+
- [CRAN-like checks results](https://rdatatable.gitlab.io/data.table/web/checks/check_results_data.table.html) - note that all artifacts, including check results page, are being published only when all test jobs successfully pass, thus one will not see an _ERROR_ status there (unless error happened on a job marked as `allow_failure`).
3131
- [docker images](https://gitlab.com/Rdatatable/data.table/container_registry) - copy/paste-able `docker pull` commands can be found at the bottom of our [CRAN-like homepage](https://rdatatable.gitlab.io/data.table/web/packages/data.table/index.html)
3232

3333
### [Travis CI](./../.travis.yml)
@@ -64,7 +64,7 @@ Base R implemented helper script to orchestrate generation of most artifacts. It
6464
Template file to produce `Dockerfile` for, as of now, three docker images. Docker images are being built and published in [_deploy_ stage in GitLab CI pipeline](./../.gitlab-ci.yml).
6565
- `r-base-dev` using `r-release`: publish docker image of `data.table` on R-release
6666
- `r-builder` using `r-release`: publish on R-release and OS dependencies for building Rmarkdown vignettes
67-
- `r-devel`: publish docker image of `data.table` on R-devel
67+
- `r-devel`: publish docker image of `data.table` on R-devel built with `--with-recommended-packages --enable-strict-barrier --disable-long-double`
6868

6969
### [`deploy.sh`](./deploy.sh)
7070

‎.ci/publish.R‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ package.index <- function(package, lib.loc, repodir="bus/integration/cran") {
6161
images = c("r-release","r-devel","r-release-builder")
6262
images.title = c("Base R release", "Base R development", "R release package builder")
6363
tags = rep("latest", 3)
64-
docker.dl = sprintf("<tr><td> %s: </td><td> <pre><code>docker pull %s/%s/%s/%s:%s</code></pre> </td></tr>", images.title, registry, namespace, project, images, tags)
64+
docker.dl = sprintf("<tr><td> %s: </td><td> <pre><code>docker pull %s/%s/%s/%s:%s</code></pre> </td></tr>", images.title, tolower(registry), tolower(namespace), tolower(project), tolower(images), tags)
6565
}
6666
index.file = file.path(repodir, "web/packages", pkg, "index.html")
6767
if (!dir.exists(dirname(index.file))) dir.create(dirname(index.file), recursive=TRUE)

‎.dev/.Rprofile‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
# Matt's ~/.Rprofile is a link to this file at ~/GitHub/data.table/.dev/.Rprofile
2+
3+
# options(repos = c(CRAN="http://cran.stat.ucla.edu"))
4+
# options(repos = c(CRAN=c("http://cran.stat.ucla.edu", "http://cloud.r-project.org"))) # both needed for revdep checks sometimes
5+
options(repos = c(CRAN="http://cloud.r-project.org"))
6+
7+
options(help_type="html")
8+
options(error=quote(dump.frames()))
9+
options(width=200)
10+
options(digits.secs=3) # for POSIXct to print milliseconds
11+
suppressWarnings(RNGversion("3.5.0")) # so when I create tests in dev there isn't a mismatch when run by cc()
12+
13+
Sys.setenv(PROJ_PATH=path.expand("~/GitHub/data.table"))
14+
source(paste0(Sys.getenv("PROJ_PATH"),"/.dev/cc.R"))

‎.dev/.bash_aliases‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
# Matt's ~/.bash_aliases is a link to this file ~/GitHub/data.table/.dev/.bash_aliases
2+
3+
# One off configure meld as difftool:
4+
# git config --global diff.tool meld
5+
# git config --global difftool.prompt false
6+
alias gd='git difftool &> /dev/null'
7+
alias gdm='git difftool master &> /dev/null'
8+
# If meld has scrolling issues, turn off GTK animation (which I don't need anyway):
9+
# https://gitlab.gnome.org/GNOME/meld/-/issues/479#note_866040
10+
11+
alias Rdevel='~/build/R-devel/bin/R --vanilla'
12+
alias Rdevel-strict-gcc='~/build/R-devel-strict-gcc/bin/R --vanilla'
13+
alias Rdevel-strict-clang='~/build/R-devel-strict-clang/bin/R --vanilla'
14+
alias Rdevel-valgrind='~/build/R-devel-valgrind/bin/R --vanilla'
15+
alias Rdevel32='~/build/32bit/R-devel/bin/R --vanilla'
16+
alias R310='~/build/R-3.1.0/bin/R --vanilla'
17+
alias revdepsh='cd ~/build/revdeplib/ && export TZ=UTC && export R_LIBS_SITE=none && export R_LIBS=~/build/revdeplib/ && export _R_CHECK_FORCE_SUGGESTS_=false'
18+
alias revdepr='revdepsh; R_PROFILE_USER=~/GitHub/data.table/.dev/revdep.R ~/build/R-devel/bin/R'
19+
20+
export R_PROFILE_USER='~/.Rprofile'
21+
# there's a .Rprofile in ~/GitHub/data.table/ so Matt sets R_PROFILE_USER here to always use ~/.Rprofile
22+
# even when starting R in ~/GitHub/data.table
23+
# Matt's ~/.Rprofile as a link to ~/GitHub/data.table/.dev/.Rprofile
24+

0 commit comments

Comments
 (0)