diff --git a/.Rbuildignore b/.Rbuildignore index 1d616f7b..328526c4 100755 --- a/.Rbuildignore +++ b/.Rbuildignore @@ -1,19 +1,19 @@ ^.*\.Rproj$ -^\.gitlab-ci.yml$ +^\.gitlab-ci\.yml$ ^\.Rprofile$ ^\.Rproj\.user$ -^\.travis.yml$ -^\.zenodo.json$ +^\.travis\.yml$ +^\.zenodo\.json$ ^_noinclude$ ^_pkgdown\.yml$ -^appveyor.yml$ +^appveyor\.yml$ ^ci.R$ ^cran-comments\.md$ ^CRAN-RELEASE$ ^doc$ ^docs$ -^git.sh$ -^gitmerge.sh$ +^git_merge\.sh$ +^git_premaster\.sh$ ^index\.md$ ^Meta$ ^packrat/ diff --git a/.gitignore b/.gitignore index abc6fc9a..a3e30bee 100755 --- a/.gitignore +++ b/.gitignore @@ -17,7 +17,7 @@ vignettes/*.R .DS_Store .Rprofile ^CRAN-RELEASE$ -git.sh -gitmerge.sh +git_premaster.sh +git_merge.sh packrat/lib*/ packrat/src/ diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e7873c2a..a32be565 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -41,8 +41,9 @@ before_script: cache: key: "$CI_COMMIT_REF_SLUG" paths: - - /usr/local/lib/R/* - - /usr/lib/R/* + - /usr/local/lib/R/site-library/ + - /usr/lib/R/site-library/ + - /usr/lib/R/library/ R 3: stage: build @@ -56,6 +57,7 @@ R 3: - PKG_FILE_NAME=$(ls -1t *.tar.gz | head -n 1) - R CMD check "${PKG_FILE_NAME}" --no-build-vignettes --no-manual --as-cran - Rscript -e 'print(.libPaths())' + - ls -lh /usr/local/lib/R/site-library artifacts: paths: - '*.Rcheck/*'