File tree Expand file tree Collapse file tree 4 files changed +12
-17
lines changed Expand file tree Collapse file tree 4 files changed +12
-17
lines changed Original file line number Diff line number Diff line change @@ -61,6 +61,11 @@ matrix:
61
61
62
62
script :
63
63
- ./script/ci-build-libsass
64
+ - ./script/ci-build-plugin math
65
+ - ./script/ci-build-plugin glob
66
+ - ./script/ci-build-plugin digest
67
+ - ./script/ci-build-plugin img-size
68
+ - ./script/ci-build-plugin tests
64
69
before_install : ./script/ci-install-deps
65
70
install : ./script/ci-install-compiler
66
71
after_success : ./script/ci-report-coverage
Original file line number Diff line number Diff line change 34
34
35
35
mkdir -p plugins
36
36
if [ ! -d plugins/libsass-${PLUGIN} ] ; then
37
- if [ " $PLUGIN " == " math" ]; then
38
- git clone https://github.com/mgreter/libsass-${PLUGIN} plugins/libsass-${PLUGIN} --branch feature/libsass-3.7
39
- elif [ " $PLUGIN " == " tests" ]; then
40
- git clone https://github.com/mgreter/libsass-${PLUGIN} plugins/libsass-${PLUGIN} --branch feature/libsass-4.0
41
- else
42
- git clone https://github.com/mgreter/libsass-${PLUGIN} plugins/libsass-${PLUGIN}
43
- fi
37
+ git clone https://github.com/mgreter/libsass-${PLUGIN} plugins/libsass-${PLUGIN} --branch feature/libsass-4.0
44
38
fi
45
39
if [ ! -d plugins/libsass-${PLUGIN} /build ] ; then
46
40
mkdir plugins/libsass-${PLUGIN} /build
@@ -56,11 +50,11 @@ cd ../../..
56
50
57
51
# glob only works on paths relative to imports
58
52
if [ " x$PLUGIN " == " xglob" ]; then
59
- ${SASSC_BIN} --precision 5 --plugin-path plugins/libsass-${PLUGIN} /build ${SASS_SPEC_SPEC_DIR} /basic/input.scss > ${SASS_SPEC_SPEC_DIR} /basic/result.css
60
- ${SASSC_BIN} --precision 5 --plugin-path plugins/libsass-${PLUGIN} /build ${SASS_SPEC_SPEC_DIR} /basic/input.scss --sourcemap > /dev/null
53
+ ${SASSC_BIN} --precision 10 --plugin-path plugins/libsass-${PLUGIN} /build ${SASS_SPEC_SPEC_DIR} /basic/input.scss > ${SASS_SPEC_SPEC_DIR} /basic/result.css
54
+ # ${SASSC_BIN} --precision 10 --plugin-path plugins/libsass-${PLUGIN}/build ${SASS_SPEC_SPEC_DIR}/basic/input.scss --sourcemap > /dev/null
61
55
else
62
56
cat ${SASS_SPEC_SPEC_DIR} /basic/input.scss | ${SASSC_BIN} --precision 5 --plugin-path plugins/libsass-${PLUGIN} /build -I ${SASS_SPEC_SPEC_DIR} /basic > ${SASS_SPEC_SPEC_DIR} /basic/result.css
63
- cat ${SASS_SPEC_SPEC_DIR} /basic/input.scss | ${SASSC_BIN} --precision 5 --plugin-path plugins/libsass-${PLUGIN} /build -I ${SASS_SPEC_SPEC_DIR} /basic --sourcemap > /dev/null
57
+ # cat ${SASS_SPEC_SPEC_DIR}/basic/input.scss | ${SASSC_BIN} --precision 5 --plugin-path plugins/libsass-${PLUGIN}/build -I ${SASS_SPEC_SPEC_DIR}/basic --sourcemap > /dev/null
64
58
fi
65
59
RETVAL=$? ; if [ " $RETVAL " != " 0" ]; then exit $RETVAL ; fi
66
60
Original file line number Diff line number Diff line change @@ -667,7 +667,7 @@ namespace Sass {
667
667
else if (endsWithIgnoreCase (abs_path, " .scss" , 5 )) {
668
668
format = SASS_IMPORT_SCSS;
669
669
}
670
- else {
670
+ else if (abs_path != " stream://stdin " ) {
671
671
throw Exception::UnknwonImport (callStack);
672
672
}
673
673
}
Original file line number Diff line number Diff line change @@ -1272,11 +1272,9 @@ namespace Sass {
1272
1272
ExternalCallable* def = static_cast <ExternalCallable*>(fn);
1273
1273
SassFunctionLambda lambda = def->lambda ();
1274
1274
struct SassValue * c_args = sass_make_list (SASS_COMMA, false );
1275
- std::cerr << " Create c_args with " << Value::unwrap (c_args).refcount << " \n " ;
1276
1275
sass_list_push (c_args, Value::wrap (message));
1277
1276
struct SassValue * c_val = lambda (
1278
1277
c_args, compiler.wrap ());
1279
- std::cerr << " After c_args with " << Value::unwrap (c_args).refcount << " \n " ;
1280
1278
sass_delete_value (c_args);
1281
1279
sass_delete_value (c_val);
1282
1280
}
@@ -1833,10 +1831,8 @@ namespace Sass {
1833
1831
return toCss (interpolation->value (), false );
1834
1832
}
1835
1833
else if (SupportsDeclaration* declaration = condition->isaSupportsDeclaration ()) {
1836
- sass::string strm (" (" );
1837
- strm += toCss (declaration->feature ()); strm += " : " ;
1838
- strm += toCss (declaration->value ()); strm += " )" ;
1839
- return strm;
1834
+ return " (" + toCss (declaration->feature ()) + " : "
1835
+ + toCss (declaration->value ()) + " )" ;
1840
1836
}
1841
1837
else if (SupportsFunction* function = condition->isaSupportsFunction ()) {
1842
1838
return acceptInterpolation (function->name (), false )
You can’t perform that action at this time.
0 commit comments