From 27cdd253e284a9aa38b313160bc2a09c9e719aa7 Mon Sep 17 00:00:00 2001 From: Steph Locke Date: Thu, 25 Jul 2019 17:55:20 +0100 Subject: [PATCH 1/5] Add drat --- .Rbuildignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.Rbuildignore b/.Rbuildignore index 0198c81..d62311c 100644 --- a/.Rbuildignore +++ b/.Rbuildignore @@ -22,3 +22,4 @@ README.html bug_reports/* ^revdep/ ^_pkgdown.yml$ +^drat\.sh$ From 5eb939bfa6c1b629331dbfbeaea370d31de69ccc Mon Sep 17 00:00:00 2001 From: Steph Locke Date: Thu, 25 Jul 2019 17:55:38 +0100 Subject: [PATCH 2/5] Create drat.sh --- drat.sh | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 drat.sh diff --git a/drat.sh b/drat.sh new file mode 100644 index 0000000..dd8a9b0 --- /dev/null +++ b/drat.sh @@ -0,0 +1,21 @@ +#!/bin/bash +set -o errexit -o nounset +addToDrat(){ + mkdir drat; cd drat + + ## Set up Repo parameters + git init + git config --global push.default simple + + ## Get drat repo + git remote add upstream "https://$GITHUB_PAT@github.com/samplerecon/recondrat.git" + git fetch upstream + git checkout master + + Rscript -e "drat::insertPackage('../$PKG_TARBALL', repodir = './drat')" + git add --all + git commit -m "add $PKG_TARBALL (build $TRAVIS_BUILD_ID)" + git push + +} +addToDrat From 8b2549f7a5f5739d54f62c16c2236feeea2d6955 Mon Sep 17 00:00:00 2001 From: Steph Locke Date: Thu, 25 Jul 2019 17:56:30 +0100 Subject: [PATCH 3/5] Add drat --- .travis.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.travis.yml b/.travis.yml index a7279d6..591a082 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,6 +2,9 @@ language: r cache: packages +r_packages: +- drat + matrix: include: - os: linux @@ -24,3 +27,4 @@ notifications: after_success: - if [[ "${R_CODECOV}" ]]; then Rscript -e 'covr::codecov()'; fi +- test $TRAVIS_PULL_REQUEST == "false" && test $TRAVIS_BRANCH == "master" && bash drat.sh From 66caa487697e3e3f4ffc4741649ab042f5f695a3 Mon Sep 17 00:00:00 2001 From: Steph Locke Date: Thu, 25 Jul 2019 17:57:15 +0100 Subject: [PATCH 4/5] Correct URL --- drat.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drat.sh b/drat.sh index dd8a9b0..9c00281 100644 --- a/drat.sh +++ b/drat.sh @@ -8,7 +8,7 @@ addToDrat(){ git config --global push.default simple ## Get drat repo - git remote add upstream "https://$GITHUB_PAT@github.com/samplerecon/recondrat.git" + git remote add upstream "https://$GITHUB_PAT@github.com/reconhub/recondrat.git" git fetch upstream git checkout master From 46141e50633c7af3ea554c7bc8b9bdb146aa501e Mon Sep 17 00:00:00 2001 From: Steph Locke Date: Thu, 25 Jul 2019 17:57:25 +0100 Subject: [PATCH 5/5] Correct URL