Skip to content

Commit 1581f37

Browse files
committed
Backport CI stuff
1 parent f7973f1 commit 1581f37

File tree

4 files changed

+64
-16
lines changed

4 files changed

+64
-16
lines changed

.Rbuildignore

+1
Original file line numberDiff line numberDiff line change
@@ -23,3 +23,4 @@ src\/RCS
2323
^homebrew$
2424
^a\.out\.dSYM$
2525
^revdep$
26+
^appveyor.yml$

.travis.yml

+12-12
Original file line numberDiff line numberDiff line change
@@ -9,32 +9,35 @@ matrix:
99
service: mysql
1010
- os: linux
1111
dist: trusty
12+
sudo: required
1213
env: R_CODECOV=true
14+
service: mysql
1315
addons:
1416
apt:
1517
packages:
16-
- mariadb-server
17-
- libmariadbclient-dev
18+
- libmysqlclient-dev
1819
- os: osx
19-
osx_image: xcode7.2
20+
osx_image: xcode8.1
2021
before_install:
2122
- brew install mariadb
2223
- mysql.server start
2324
latex: false
2425
- os: osx
25-
osx_image: xcode7.2
26+
osx_image: xcode8.1
2627
before_install:
2728
- brew install mysql
2829
- mysql.server start
2930
latex: false
3031
- os: osx
31-
osx_image: beta-xcode6.1
32+
osx_image: xcode8.1
3233
disable_homebrew: true
3334
r_check_args: '--no-tests'
34-
before_script: 'echo skipping mysql setup'
35-
36-
r_github_packages:
37-
- jimhester/covr
35+
before_script: 'echo no sql server, only testing build'
36+
- os: osx
37+
osx_image: beta-xcode6.4
38+
disable_homebrew: true
39+
r_check_args: '--no-tests'
40+
before_script: 'echo no sql server, only testing build'
3841

3942
warnings_are_errors: true
4043
#r_check_revdep: true
@@ -48,6 +51,3 @@ before_script:
4851
- mysql -e "create database IF NOT EXISTS test;" -uroot
4952
- mysql -e "CREATE USER 'billy'@'localhost' IDENTIFIED BY 'supersecret';" -uroot
5053
- printf "[rs-dbi]\nusername=billy\npassword=supersecret\n" > ~/.my.cnf
51-
52-
after_success:
53-
- if [[ "${R_CODECOV}" ]]; then R -e 'covr::codecov()'; fi

RMySQL.Rproj

-4
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,6 @@ Encoding: UTF-8
1212
RnwWeave: Sweave
1313
LaTeX: pdfLaTeX
1414

15-
AutoAppendNewline: Yes
16-
StripTrailingWhitespace: Yes
17-
1815
BuildType: Package
1916
PackageUseDevtools: Yes
2017
PackageInstallArgs: --no-multiarch --with-keep.source
21-
PackageRoxygenize: rd,namespace

appveyor.yml

+51
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
# DO NOT CHANGE the "init" and "install" sections below
2+
3+
# Download script file from GitHub
4+
init:
5+
ps: |
6+
$ErrorActionPreference = "Stop"
7+
Invoke-WebRequest http://raw.github.com/krlmlr/r-appveyor/master/scripts/appveyor-tool.ps1 -OutFile "..\appveyor-tool.ps1"
8+
Import-Module '..\appveyor-tool.ps1'
9+
10+
install:
11+
- ps: Bootstrap
12+
- cmd: rm -f *.Rproj
13+
14+
# Adapt as necessary starting from here
15+
16+
# 2017: doesn't seem to work (anymore)
17+
services:
18+
- mysql
19+
20+
environment:
21+
MYSQL_USER: root
22+
MYSQL_PWD: Password12!
23+
24+
build_script:
25+
- travis-tool.sh install_deps
26+
27+
test_script:
28+
- travis-tool.sh run_tests
29+
30+
on_failure:
31+
- 7z a failure.zip *.Rcheck\*
32+
- appveyor PushArtifact failure.zip
33+
34+
artifacts:
35+
- path: '*.Rcheck\**\*.log'
36+
name: Logs
37+
38+
- path: '*.Rcheck\**\*.out'
39+
name: Logs
40+
41+
- path: '*.Rcheck\**\*.fail'
42+
name: Logs
43+
44+
- path: '*.Rcheck\**\*.Rout'
45+
name: Logs
46+
47+
- path: '\*_*.tar.gz'
48+
name: Bits
49+
50+
- path: '\*_*.zip'
51+
name: Bits

0 commit comments

Comments
 (0)