Skip to content

Commit cde6ace

Browse files
committed
CI: AppVeyor configuration improvements:
* Adds branding to AppVeyor configuration. * Currently it was only printing it in Travis-CI. * Enables MSVC tests for MSVC Debug configuration. * Removes redundancies by cleaning up conditions and using environment variables. * Speeds up gem install by skipping the ri-docs, but still it is super slow. Lets remove Ruby dependency from LibSass altogether! :D
1 parent 1ebed7a commit cde6ace

File tree

1 file changed

+15
-30
lines changed

1 file changed

+15
-30
lines changed

appveyor.yml

Lines changed: 15 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
1+
os: Visual Studio 2015
2+
13
environment:
24
CTEST_OUTPUT_ON_FAILURE: 1
5+
ruby_version: 22-x64
6+
TargetPath: sassc/bin/sassc
37
matrix:
48
- Compiler: msvc
59
Config: Release
6-
ruby_version: "21-x64"
710
- Compiler: msvc
811
Config: Debug
9-
ruby_version: "21-x64"
1012
- Compiler: mingw
1113
Build: static
12-
ruby_version: "21-x64"
1314
- Compiler: mingw
1415
Build: shared
15-
ruby_version: "21-x64"
1616

1717
cache:
1818
- C:\Ruby%ruby_version%\lib\ruby\gems
@@ -22,7 +22,7 @@ install:
2222
- git clone https://github.com/sass/sass-spec.git
2323
- set PATH=C:\Ruby%ruby_version%\bin;%PATH%
2424
- ps: |
25-
if(!(gem which minitest 2>$nul)) { gem install minitest }
25+
if(!(gem which minitest 2>$nul)) { gem install minitest --no-ri --no-rdoc }
2626
if ($env:Compiler -eq "mingw" -AND -Not (Test-Path "C:\mingw64")) {
2727
# Install MinGW.
2828
$url = "http://sourceforge.net/projects/mingw-w64/files/"
@@ -40,31 +40,16 @@ build_script:
4040
if ($env:Compiler -eq "mingw") {
4141
mingw32-make -j4 sassc
4242
} else {
43-
msbuild /m:4 /p:Configuration=$env:Config win\libsass.sln
44-
}
45-
- ps: |
46-
if ($env:Compiler -eq "mingw") {
47-
sassc\bin\sassc.exe -v
48-
ruby -v
49-
} else {
50-
if ($env:Config -eq "Debug") {
51-
win\bin\Debug\sassc.exe -v
52-
ruby -v
53-
} else {
54-
win\bin\sassc.exe -v
55-
ruby -v
56-
}
43+
msbuild /m:4 /p:Configuration=$env:Config sassc\win\sassc.sln
5744
}
5845
46+
# print the branding art
47+
mv script/branding script/branding.ps1
48+
script/branding.ps1
49+
50+
# print the version info
51+
&$env:TargetPath -v
52+
ruby -v
53+
5954
test_script:
60-
- ps: |
61-
if ($env:Compiler -eq "mingw") {
62-
ruby sass-spec\sass-spec.rb -c sassc\bin\sassc.exe -s --ignore-todo sass-spec/spec
63-
} else {
64-
if ($env:Config -eq "Debug") {
65-
echo "test runner in debug mode build via msvc will throw debug assertions"
66-
echo ruby sass-spec\sass-spec.rb -c win\bin\Debug\sassc.exe -s --ignore-todo sass-spec/spec
67-
} else {
68-
ruby sass-spec\sass-spec.rb -c win\bin\sassc.exe -s --ignore-todo sass-spec/spec
69-
}
70-
}
55+
- ps: ruby sass-spec/sass-spec.rb -c $env:TargetPath -s --ignore-todo sass-spec/spec

0 commit comments

Comments
 (0)