diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-09-04 02:18:51 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-09-04 02:18:51 +0000 |
| commit | 2cbf44e55b2e7d8d9db48b67602a3935932a2aab (patch) | |
| tree | e0e64e557caf72353b769594a674ed5ac622c720 /appveyor.yml | |
| parent | b120f5e38d9c9817a18723d8002665e6dd29f7a6 (diff) | |
appveyor.yml: reduce matrix factors
* appveyor.yml (environment): separate matrix factors by `build` (`vs`
or `msys2`), and `build` (and `vs` version if VS build).
now `MSYS2_ARCH` and `MSYSTEM` are derived from `Platform` if msys2
build.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@64626 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'appveyor.yml')
| -rw-r--r-- | appveyor.yml | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/appveyor.yml b/appveyor.yml index 3f2ac882e0..74b361c4b1 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -7,9 +7,9 @@ environment: ruby_version: "24-%Platform%" zlib_version: "1.2.11" matrix: - - vs: "120" - - MSYS2_ARCH: x86_64 - MSYSTEM: MINGW64 + - build: vs + vs: 120 + - build: msys2 matrix: fast_finish: true notifications: @@ -46,7 +46,7 @@ for: - matrix: only: - - vs: "120" + - build: vs install: - ver - chcp @@ -95,15 +95,16 @@ for: - matrix: only: - - MSYS2_ARCH: x86_64 - MSYSTEM: MINGW64 + - build: msys2 install: - ver - chcp - set /a JOBS=%NUMBER_OF_PROCESSORS% - set MSYS_NO_PATHCONV=1 - - SET BITS=%Platform:x86=32% - - SET BITS=%BITS:x=% + - SET MSYSTEM=%Platform:x86=32% + - SET MSYSTEM=%MSYSTEM:x=MINGW% + - SET MSYS2_ARCH=%Platform:x86=i686% + - SET MSYS2_ARCH=%MSYS2_ARCH:x64=x86_64% - SET ruby_path=C:\Ruby%ruby_version:-x86=% - SET PATH=\usr\local\bin;%ruby_path%\bin;%PATH%;C:\msys64\%MSYSTEM%\bin;C:\msys64\usr\bin - ruby --version |