From 48384302231712054d21643fb7f8caa03a4da73b Mon Sep 17 00:00:00 2001 From: "Thomas J. Leeper" Date: Thu, 12 Apr 2018 08:38:07 -0700 Subject: [PATCH] tweak .travis.yml --- .Rbuildignore | 2 +- .travis.yml | 30 +++++++++++++++--------------- DESCRIPTION | 3 ++- knitreadme.sh | 21 --------------------- 4 files changed, 18 insertions(+), 38 deletions(-) delete mode 100644 knitreadme.sh diff --git a/.Rbuildignore b/.Rbuildignore index 30e4ec7..d369634 100644 --- a/.Rbuildignore +++ b/.Rbuildignore @@ -7,4 +7,4 @@ /man-roxygen ^.*\.Rproj$ ^\.Rproj\.user$ -^\.github/ +^\.github.? diff --git a/.travis.yml b/.travis.yml index ca71aa1..4bbe901 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,26 +3,26 @@ sudo: false cache: packages matrix: include: - - os: linux - dist: trusty - sudo: required - env: R_CODECOV=true - - os: osx - osx_image: xcode9.2 - - os: osx - osx_image: xcode7.3 - r_build_args: '--no-build-vignettes' - r_check_args: '--ignore-vignettes --no-examples' + - os: linux + dist: trusty + sudo: required + env: DRAT_DEPLOY=true + - os: osx + osx_image: xcode9.2 + - os: osx + osx_image: xcode7.3 + r_build_args: "--no-build-vignettes" + r_check_args: "--ignore-vignettes --no-examples" r_packages: - covr - drat r_github_packages: - cloudyr/travisci after_success: -- Rscript -e 'library("covr");codecov()' -- test $TRAVIS_PULL_REQUEST == "false" && test $TRAVIS_BRANCH == "master" && bash - drat.sh -- Rscript -e "travisci::restart_last_build('cloudyr/awspack')" +- R -q -e 'library("covr");codecov()' +- test $TRAVIS_PULL_REQUEST == "false" && test $TRAVIS_BRANCH == "master" && test + $DRAT_DEPLOY == "true" && bash drat.sh +- R -q -e "travisci::restart_last_build('cloudyr/awspack')" env: global: - secure: gerdU9yxd8IqRQRBDEplNhJf36NrloSAje4LIK9gdaHYrT7iu+je8SK24G9LmcKWB7qSn0UwFLuq/hTugViHRIdV1aLLC/G65jTuVXe8SOigp7H9+nyp45kee1gMgZjvXEphIjt9qoX69Z6DFM3P98rMVuSm/m564iNnn76tl11mrliNR7bJGNic2BSjOYCbr6lHNflEcsTgFs3xK+bVLRpymlzjnAwtjmY1npXhD1m0vKaWa55Gspc7Zc+q4IWGiGk3vR32t9Wgbfe9M18OsRQwo93dBS66GwH3QV9g0/RsHRWIjuItP9qVQgG3Afs7cyHDkbp4Rjmf3fLeBz6xPAcGanG7y967XpOn3fTXbTzEsh73unz+efx2LSfEAunPwb9RhYSjCJX7i33MhQKoeg1aSC7nWEGu9RlGrfMR7TgLEJ6iqJOu93xqew4PdFigcF86azSok33UKTESipecJaj2D/fgW8F8F3dUR7JKE2P63Xzzd82FQ+5d1tYl5E9es6kF51IEyJpVGHxtN64EiLLubaSWbFNc8trh7BIr4aIvSXrV3ohqVHcdXbgjtbRFrjx9Zh89JXbCTS1st6G4WYaQctKVvavIXbQE+u6b7J6CZDMz3P90mcH09sLVIeIs689V1Cprb2L3ko+dBAfY/OpXyymGjzRWWiQDGb2hCTQ= + secure: kLDGA4nZ0TxupjkKbN8rDkzeqSCC1MmHn18H97bGYhg+isJoaHstD1pvpymbL4WegtdNwUA+Rd4q/MQf888bCrn2flCEadcqxWZXTqyGP8f5mKIrpOtUijvz/XJU9Xx7OO81jqWUC6hDQLM7MXw5Hz0/USQTr3mSFmyjwEPJ64afdKWFASrSEMdyTy3ngTGOMF74hy2PPpGf7n7e4BzA346tUDj6WnPPGkDQZb/fREAISBcjiIDov2wK9GtWwH9xNeGDCyxj9Lbt6F6rD+ILplTskhVkyhXQGuATXgcoqLSBzRkkGvl0o3VuYMt+r7hHzh1HM/t+IZyvdUPV7DMaFe1I+ODc5KECNEA5HyOcTgatdH4AzeLO7lm5YgOuycxKnHyWRRjQ3iyWrjphW+K1GK3XxK32Hab3llgFOZBEwJVBCn2ZaNNHzE0Y8Th4RF6gyH7R68I0PKu+K80m+K4LA7MKX/pM3s+Md+OISOZ742XdzRRaZjKpAH4/v81IDq8F21a+jqgh5yXzZTFDwU2r49lC3oO1RKbpitqchP0L3B/jwDJ3VFdNUy07FCwSZwcNSKjIkkgs/9BfKvlNYf9i0nRJ3sNRf8OOSXH4DPw4l6gPCglfw6M8aP68cbW8I5VvKYSZ9Ks7gy0f4stXbjZG0ygnsEpDYZoKyeup8wiO9rA= diff --git a/DESCRIPTION b/DESCRIPTION index a2ee1d1..a9c01ed 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -4,7 +4,8 @@ Title: Get EC2 Instance Metadata Version: 0.1.4 Date: 2018-04-02 Authors@R: c(person("Thomas J.", "Leeper", role = c("aut", "cre"), - email = "thosjleeper@gmail.com")) + email = "thosjleeper@gmail.com", + comment = c(ORCID = "0000-0003-4097-6326"))) Description: Retrieve Amazon EC2 instance metadata from within the running instance. License: GPL (>= 2) URL: https://github.com/cloudyr/aws.ec2metadata diff --git a/knitreadme.sh b/knitreadme.sh deleted file mode 100644 index b988e96..0000000 --- a/knitreadme.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/bash -set -o errexit -o nounset -knitreadme(){ - ## Set up Repo parameters - git init - git config user.name "leeper" - git config user.email "thosjleeper@gmail.com" - git config --global push.default simple - - ## Get drat repo - git remote add upstream "https://$GH_TOKEN@github.com/$TRAVIS_REPO_SLUG.git" - git fetch upstream - git checkout master - - Rscript -e 'library("knitr");knitr::knit("README.Rmd")' - - git add README.md - git commit -m "knit README [skip ci]" - git push -} -knitreadme