You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@arrow.apache.org by we...@apache.org on 2019/02/11 22:56:10 UTC
[arrow] branch master updated: ARROW-3631: [C#] Add Appveyor
configuration
This is an automated email from the ASF dual-hosted git repository.
wesm pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/arrow.git
The following commit(s) were added to refs/heads/master by this push:
new 62dd09d ARROW-3631: [C#] Add Appveyor configuration
62dd09d is described below
commit 62dd09d642f0a75cb75914bd6f6ec71f29d9a145
Author: Wes McKinney <we...@apache.org>
AuthorDate: Mon Feb 11 16:55:10 2019 -0600
ARROW-3631: [C#] Add Appveyor configuration
Author: Wes McKinney <we...@apache.org>
Closes #3615 from wesm/ARROW-3631 and squashes the following commits:
573ccc58 <Wes McKinney> Re-enable all builds
3a0b5943 <Wes McKinney> Set appveyor image
34db0d10 <Wes McKinney> fix
70011497 <Wes McKinney> fix up appveyor-install.bat also
4dc513b6 <Wes McKinney> Add C# build to appveyor.yml
---
appveyor.yml | 6 ++-
ci/appveyor-build.bat | 36 ++++++++++++-----
...ppveyor-build.bat => appveyor-csharp-build.bat} | 20 +++------
ci/appveyor-install.bat | 47 ++++++++++++++--------
4 files changed, 67 insertions(+), 42 deletions(-)
diff --git a/appveyor.yml b/appveyor.yml
index e529ef7..082063a 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -19,12 +19,13 @@
os: Visual Studio 2015
only_commits:
- # Skip commits not related to Python, C++ or Rust
+ # Skip commits not related to Python, C++, C#, or Rust
files:
- appveyor.yml
- c_glib/
- ci/
- cpp/
+ - csharp/
- format/
- python/
- rust/
@@ -85,6 +86,9 @@ environment:
- JOB: "Rust"
TARGET: x86_64-pc-windows-msvc
USE_CLCACHE: false
+ - JOB: "C#"
+ APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
+ USE_CLCACHE: false
MSVC_DEFAULT_OPTIONS: ON
APPVEYOR_SAVE_CACHE_ON_ERROR: true
diff --git a/ci/appveyor-build.bat b/ci/appveyor-build.bat
index 6e55419..2d5b37a 100644
--- a/ci/appveyor-build.bat
+++ b/ci/appveyor-build.bat
@@ -17,16 +17,30 @@
@echo on
-if "%JOB%" == "Rust" (
- call ci\rust-build-main.bat
+IF /i "%JOB%" == "C#" goto csharp
+IF /i "%JOB%" == "rust" goto rust
+
+@rem All other builds are C++ builds
+goto cpp
+
+:cpp
+git config core.symlinks true
+git reset --hard
+if "%JOB:~,5%" == "MinGW" (
+ call ci\appveyor-cpp-build-mingw.bat
+) else if "%JOB%" == "Cmake_Script_Tests" (
+ call ci\appveyor-cpp-test-cmake-script.bat
) else (
- git config core.symlinks true
- git reset --hard
- if "%JOB:~,5%" == "MinGW" (
- call ci\appveyor-cpp-build-mingw.bat
- ) else if "%JOB%" == "Cmake_Script_Tests" (
- call ci\appveyor-cpp-test-cmake-script.bat
- ) else (
- call ci\appveyor-cpp-build.bat
- )
+ call ci\appveyor-cpp-build.bat
)
+goto scriptexit
+
+:csharp
+call ci\appveyor-csharp-build.bat
+goto scriptexit
+
+:rust
+call ci\rust-build-main.bat
+goto scriptexit
+
+:scriptexit
diff --git a/ci/appveyor-build.bat b/ci/appveyor-csharp-build.bat
similarity index 69%
copy from ci/appveyor-build.bat
copy to ci/appveyor-csharp-build.bat
index 6e55419..14dc71d 100644
--- a/ci/appveyor-build.bat
+++ b/ci/appveyor-csharp-build.bat
@@ -15,18 +15,10 @@
@rem specific language governing permissions and limitations
@rem under the License.
-@echo on
+@rem The "main" C# build script for Windows CI
-if "%JOB%" == "Rust" (
- call ci\rust-build-main.bat
-) else (
- git config core.symlinks true
- git reset --hard
- if "%JOB:~,5%" == "MinGW" (
- call ci\appveyor-cpp-build-mingw.bat
- ) else if "%JOB%" == "Cmake_Script_Tests" (
- call ci\appveyor-cpp-test-cmake-script.bat
- ) else (
- call ci\appveyor-cpp-build.bat
- )
-)
+pushd csharp
+
+dotnet test || exit /B
+
+popd
diff --git a/ci/appveyor-install.bat b/ci/appveyor-install.bat
index 3ab8f38..78269d0 100644
--- a/ci/appveyor-install.bat
+++ b/ci/appveyor-install.bat
@@ -17,19 +17,34 @@
@echo on
-if "%JOB%" == "Rust" (
- curl -sSf -o rustup-init.exe https://win.rustup.rs/
- rustup-init.exe -y --default-host %TARGET% --default-toolchain stable
- set "PATH=%PATH%;C:\Users\Appveyor\.cargo\bin"
- rustup install stable
- rustup install nightly
- rustc -Vv
- cargo -V
-) else if "%JOB:~,5%" == "MinGW" (
- call ci\appveyor-cpp-setup-mingw.bat
-) else (
- set "PATH=C:\Miniconda36-x64;C:\Miniconda36-x64\Scripts;C:\Miniconda36-x64\Library\bin;%PATH%"
- set BOOST_ROOT=C:\Libraries\boost_1_67_0
- set BOOST_LIBRARYDIR=C:\Libraries\boost_1_67_0\lib64-msvc-14.0
- call ci\appveyor-cpp-setup.bat
-)
+IF /i "%JOB%" == "C#" goto csharp
+IF "%JOB:~,5%" == "MinGW" goto mingw
+IF /i "%JOB%" == "rust" goto rust
+
+@rem all else are C++
+goto cpp
+
+:cpp
+set "PATH=C:\Miniconda36-x64;C:\Miniconda36-x64\Scripts;C:\Miniconda36-x64\Library\bin;%PATH%"
+set BOOST_ROOT=C:\Libraries\boost_1_67_0
+set BOOST_LIBRARYDIR=C:\Libraries\boost_1_67_0\lib64-msvc-14.0
+call ci\appveyor-cpp-setup.bat
+goto scriptexit
+
+:rust
+curl -sSf -o rustup-init.exe https://win.rustup.rs/
+rustup-init.exe -y --default-host %TARGET% --default-toolchain stable
+set "PATH=%PATH%;C:\Users\Appveyor\.cargo\bin"
+rustup install stable
+rustup install nightly
+rustc -Vv
+cargo -V
+goto scriptexit
+
+:mingw
+call ci\appveyor-cpp-setup-mingw.bat
+goto scriptexit
+
+:csharp
+
+:scriptexit