From 60c50d2489ea1d7d69bf9113a68ad0b90a635a1c Mon Sep 17 00:00:00 2001 From: Kenji Okimoto Date: Wed, 28 Nov 2018 09:38:39 +0900 Subject: [PATCH 1/4] appveyor: Organize ruby versions Signed-off-by: Kenji Okimoto --- appveyor.yml | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 9d6b8e2..9cd2b85 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -12,19 +12,27 @@ test_script: # https://www.appveyor.com/docs/installed-software/#ruby environment: matrix: + - ruby_version: "25-x64" + devkit: C:\Ruby25-x64\DevKit + - ruby_version: "25" + devkit: C:\Ruby25\DevKit + - ruby_version: "24-x64" + devkit: C:\Ruby24-x64\DevKit + - ruby_version: "24" + devkit: C:\Ruby24\DevKit - ruby_version: "23-x64" devkit: C:\Ruby23-x64\DevKit - ruby_version: "23" devkit: C:\Ruby23\DevKit - ruby_version: "22-x64" - devkit: C:\Ruby23-x64\DevKit + devkit: C:\Ruby22-x64\DevKit - ruby_version: "21-x64" - devkit: C:\Ruby23-x64\DevKit + devkit: C:\Ruby21-x64\DevKit - ruby_version: "22" - devkit: C:\Ruby23\DevKit + devkit: C:\Ruby22\DevKit WIN_RAPID: true - ruby_version: "21" - devkit: C:\Ruby23\DevKit + devkit: C:\Ruby21\DevKit WIN_RAPID: true matrix: allow_failures: From e80dff19cc514fa8dcee1f2f4734b2af162d2502 Mon Sep 17 00:00:00 2001 From: Kenji Okimoto Date: Wed, 28 Nov 2018 10:18:21 +0900 Subject: [PATCH 2/4] appveyor: Add remote desktop snippet Signed-off-by: Kenji Okimoto --- appveyor.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/appveyor.yml b/appveyor.yml index 9cd2b85..868a412 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,4 +1,8 @@ version: '{build}' + +# init: +# - ps: iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1')) + install: - SET PATH=C:\Ruby%ruby_version%\bin;%PATH% - "%devkit%\\devkitvars.bat" From 997f73785e9e65e13b1024da89e461a079b3e911 Mon Sep 17 00:00:00 2001 From: Kenji Okimoto Date: Wed, 28 Nov 2018 10:23:01 +0900 Subject: [PATCH 3/4] appveyor: Use ridk Signed-off-by: Kenji Okimoto --- appveyor.yml | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 868a412..7534636 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -5,10 +5,11 @@ version: '{build}' install: - SET PATH=C:\Ruby%ruby_version%\bin;%PATH% - - "%devkit%\\devkitvars.bat" + - IF %ridk%==0 "%devkit%\\devkitvars.bat" - ruby --version - gem --version - - bundle install + - IF %ridk%==0 bundle install + - IF %ridk%==1 ridk.cmd exec bundle install build: off test_script: - bundle exec rake test @@ -17,26 +18,32 @@ test_script: environment: matrix: - ruby_version: "25-x64" - devkit: C:\Ruby25-x64\DevKit + ridk: 1 - ruby_version: "25" - devkit: C:\Ruby25\DevKit + ridk: 1 - ruby_version: "24-x64" - devkit: C:\Ruby24-x64\DevKit + ridk: 1 - ruby_version: "24" - devkit: C:\Ruby24\DevKit + ridk: 1 - ruby_version: "23-x64" devkit: C:\Ruby23-x64\DevKit + ridk: 0 - ruby_version: "23" devkit: C:\Ruby23\DevKit + ridk: 0 - ruby_version: "22-x64" devkit: C:\Ruby22-x64\DevKit + ridk: 1 - ruby_version: "21-x64" devkit: C:\Ruby21-x64\DevKit + ridk: 1 - ruby_version: "22" devkit: C:\Ruby22\DevKit + ridk: 1 WIN_RAPID: true - ruby_version: "21" devkit: C:\Ruby21\DevKit + ridk: 1 WIN_RAPID: true matrix: allow_failures: From f16b352afff608a0d589263920260b2b788eb9d7 Mon Sep 17 00:00:00 2001 From: Kenji Okimoto Date: Wed, 28 Nov 2018 10:50:52 +0900 Subject: [PATCH 4/4] appveyor: Use C:\Ruby23* for Ruby2.2 and Ruby2.1 Signed-off-by: Kenji Okimoto --- appveyor.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 7534636..7d91c43 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -32,19 +32,19 @@ environment: devkit: C:\Ruby23\DevKit ridk: 0 - ruby_version: "22-x64" - devkit: C:\Ruby22-x64\DevKit - ridk: 1 + devkit: C:\Ruby23-x64\DevKit + ridk: 0 - ruby_version: "21-x64" - devkit: C:\Ruby21-x64\DevKit - ridk: 1 + devkit: C:\Ruby23-x64\DevKit + ridk: 0 - ruby_version: "22" - devkit: C:\Ruby22\DevKit - ridk: 1 + devkit: C:\Ruby23\DevKit WIN_RAPID: true + ridk: 0 - ruby_version: "21" - devkit: C:\Ruby21\DevKit - ridk: 1 + devkit: C:\Ruby23\DevKit WIN_RAPID: true + ridk: 0 matrix: allow_failures: - ruby_version: "21"