Skip to content

Commit

Permalink
Fix merge conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
JustinCCYap committed Aug 8, 2022
2 parents 1fbe887 + 3e620a8 commit 2c5dec9
Showing 1 changed file with 6 additions and 2 deletions.
8 changes: 6 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,14 @@ before_install:
- export R_REMOTES_NO_ERRORS_FROM_WARNINGS="true"
- sudo add-apt-repository -y ppa:ubuntugis/ubuntugis-unstable
- sudo apt-get -qq update
- sudo apt-get install -y libgdal-dev libproj-dev python-protobuf libprotoc-dev libprotobuf-dev libv8-dev librsvg2-dev libmpfr-dev libnlopt-dev libharfbuzz-dev libfribidi-dev
- sudo apt-get install -y libgdal-dev libproj-dev python-protobuf libprotoc-dev libprotobuf-dev libv8-dev librsvg2-dev libmpfr-dev libnlopt-dev libharfbuzz-dev libfribidi-dev
- sudo add-apt-repository -y ppa:cran/libgit2
- sudo apt-get -qq update
- sudo apt-get install libgit2-dev
- mkdir -p ~/.R/
- echo "CXXFLAGS = `R CMD config CXXFLAGS` -g0 -flto -w" >> ~/.R/Makevars
- echo "CXX14FLAGS = -w -O3" >> ~/.R/Makevars
- sudo apt-get install -y r-cran-rcppeigen
- rcode="options('testthat.progress.max_fails' = Inf); "
- rcode+="tfile <- tempfile(); capture.output(res<-devtools::test(), file = tfile); out <- readLines(tfile); cat(out, sep = '\n'); "
- rcode+="line.fail <- max(grep('FAIL', out)); "
Expand Down Expand Up @@ -47,7 +51,7 @@ notifications:
rooms:
- displayr:FTgSTNHC2rpanhJMGTKMwZXM#github-notifications
template:
- "Build <%{build_url}|#%{build_number}> %{result} in %{repository_name}@%{branch} by %{author}: <%{compare_url}|%{commit_message}>"
- "Build <%{build_url}|#%{build_number}> %{result} in %{repository_name}@%{branch} by %{author}: <%{compare_url}|%{commit_subject}>"
on_success: change
on_failure: always
Expand Down

0 comments on commit 2c5dec9

Please sign in to comment.