From 384f5f64de6af2614e7e853d811a26eac82f4d5f Mon Sep 17 00:00:00 2001 From: dschlaep Date: Thu, 28 Sep 2017 07:12:18 -0400 Subject: [PATCH 1/4] Ignore all test project output from repository --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index eacfcbdb6..ee64cdd7c 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,6 @@ # Example code in package build process *-Ex.R /Debug/ + +# Test project output +/testing/Output/* From df26e410508a8ec685c53a9645c406faba03725a Mon Sep 17 00:00:00 2001 From: dschlaep Date: Thu, 28 Sep 2017 08:08:29 -0400 Subject: [PATCH 2/4] Add appveyor ci and badge --- README.md | 18 +++++++++++++++++- appveyor.yml | 10 ++++++++++ 2 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 appveyor.yml diff --git a/README.md b/README.md index 2292944ec..a3090d827 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,20 @@ -[![Travis-CI Build Status](https://travis-ci.org/Burke-Lauenroth-Lab/SOILWAT2.svg?branch=master)](https://travis-ci.org/Burke-Lauenroth-Lab/SOILWAT2) +| Unix | Windows | Release | License | Coverage | Downloads | +| :---- | :---- | :---- | :---- | :---- | :---- | +[ ![Travis build status][1]][2] | [![Appveyor build status][3]][4] | [ ![github release][5]][6] | [![license][7]][8] | [![codecov status][9]][10] | [![github downloads][11]][12] | + +[1]: https://travis-ci.org/Burke-Lauenroth-Lab/SOILWAT2.svg?branch=master +[2]: https://travis-ci.org/Burke-Lauenroth-Lab/SOILWAT2 +[3]: https://ci.appveyor.com/api/projects/status/noes9lralyjhen3t/branch/master?svg=true +[4]: https://ci.appveyor.com/project/dschlaep/soilwat2/branch/master +[5]: https://img.shields.io/github/release/Burke-Lauenroth-Lab/SOILWAT2.svg?label=current+release +[6]: https://github.com/Burke-Lauenroth-Lab/SOILWAT2/releases +[7]: https://img.shields.io/github/license/Burke-Lauenroth-Lab/SOILWAT2.svg +[8]: https://www.gnu.org/licenses/gpl.html +[9]: https://codecov.io/gh/Burke-Lauenroth-Lab/SOILWAT2/branch/master/graph/badge.svg +[10]: https://codecov.io/gh/Burke-Lauenroth-Lab/SOILWAT2 +[11]: https://img.shields.io/github/downloads/Burke-Lauenroth-Lab/SOILWAT2/total.svg +[12]: https://github.com/Burke-Lauenroth-Lab/SOILWAT2 + # SOILWAT2 diff --git a/appveyor.yml b/appveyor.yml new file mode 100644 index 000000000..6708a6c59 --- /dev/null +++ b/appveyor.yml @@ -0,0 +1,10 @@ +platform: + - x86 + - Any CPU + +matrix: + fast_finish: true + +# to run your custom scripts instead of automatic MSBuild +build_script: + make compile From 0f7abcdfb474e2ba211e8b3e45d049c7d3f19d00 Mon Sep 17 00:00:00 2001 From: dschlaep Date: Thu, 28 Sep 2017 08:20:11 -0400 Subject: [PATCH 3/4] Appveyor-ci: set cygwin home --- appveyor.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 6708a6c59..45b551959 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -7,4 +7,5 @@ matrix: # to run your custom scripts instead of automatic MSBuild build_script: - make compile + - set HOME=c:\cygwin\home\appveyor + - c:\cygwin\bin\make compile From 5b6efb94533d95ae4a84b701c17a52c53742ea82 Mon Sep 17 00:00:00 2001 From: dschlaep Date: Thu, 28 Sep 2017 08:28:49 -0400 Subject: [PATCH 4/4] appveyor-ci: set path to include cyginw\bin - previous yaml instructions failed with > c:\cygwin\bin\make compile > gcc -O3 -Wall -Wextra -o sw_v31 ... > make: gcc: Command not found --- appveyor.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 45b551959..05b449fa4 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -7,5 +7,5 @@ matrix: # to run your custom scripts instead of automatic MSBuild build_script: - - set HOME=c:\cygwin\home\appveyor - - c:\cygwin\bin\make compile + - set PATH=%PATH%;c:\cygwin\bin + - make compile