This repository was archived by the owner on Sep 5, 2024. It is now read-only.
File tree Expand file tree Collapse file tree 7 files changed +72
-1149
lines changed Expand file tree Collapse file tree 7 files changed +72
-1149
lines changed Original file line number Diff line number Diff line change @@ -39,17 +39,14 @@ var_5: &save_cache
3939var_6 : &npm_install
4040 run : npm ci
4141
42- var_7 : &rebuild_node_sass
43- run : npm rebuild node-sass
44-
45- var_8 : &store_junit_test_results
42+ var_7 : &store_junit_test_results
4643 store_test_results :
4744 path : ./artifacts/junit
4845
4946# Branch filter that we can specify for jobs that should only run on publish branches. This filter
5047# is used to ensure that not all upstream branches will be published as Github builds
5148# (e.g. revert branches, feature branches)
52- var_9 : &publish_branches_filter
49+ var_8 : &publish_branches_filter
5350 branches :
5451 only :
5552 - master
9390 - checkout_and_rebase
9491 - *restore_cache
9592 - *npm_install
96- - *rebuild_node_sass
9793 - run : npm run lint
9894
9995 # -----------------------------------
@@ -105,7 +101,6 @@ jobs:
105101 - checkout_and_rebase
106102 - *restore_cache
107103 - *npm_install
108- - *rebuild_node_sass
109104 - run : npm run build
110105 - *save_cache
111106
Original file line number Diff line number Diff line change @@ -8,7 +8,7 @@ const lazypipe = require('lazypipe');
88const mkdirp = require ( 'mkdirp' ) ;
99const ngHtml2js = require ( 'gulp-ng-html2js' ) ;
1010const path = require ( 'path' ) ;
11- const sass = require ( 'gulp-sass' ) ;
11+ const sass = require ( 'gulp-sass' ) ( require ( 'sass' ) ) ;
1212const through2 = require ( 'through2' ) ;
1313const uglify = require ( 'gulp-uglify' ) ;
1414const utils = require ( '../scripts/gulp-utils.js' ) ;
Original file line number Diff line number Diff line change @@ -7,7 +7,7 @@ const fs = require('fs');
77const path = require ( 'path' ) ;
88const through2 = require ( 'through2' ) ;
99const lazypipe = require ( 'lazypipe' ) ;
10- const sass = require ( 'gulp-sass' ) ;
10+ const sass = require ( 'gulp-sass' ) ( require ( 'sass' ) ) ;
1111const gulpif = require ( 'gulp-if' ) ;
1212const _ = require ( 'lodash' ) ;
1313
Original file line number Diff line number Diff line change @@ -7,7 +7,7 @@ const concat = require('gulp-concat');
77const series = require ( 'stream-series' ) ;
88const util = require ( '../util' ) ;
99const sassUtils = require ( '../../scripts/gulp-utils' ) ;
10- const sass = require ( 'gulp-sass' ) ;
10+ const sass = require ( 'gulp-sass' ) ( require ( 'sass' ) ) ;
1111const insert = require ( 'gulp-insert' ) ;
1212const gulpif = require ( 'gulp-if' ) ;
1313const minifyCss = util . minifyCss ;
Original file line number Diff line number Diff line change @@ -12,7 +12,7 @@ const series = require('stream-series');
1212const lazypipe = require ( 'lazypipe' ) ;
1313const glob = require ( 'glob' ) . sync ;
1414const uglify = require ( 'gulp-uglify' ) ;
15- const sass = require ( 'gulp-sass' ) ;
15+ const sass = require ( 'gulp-sass' ) ( require ( 'sass' ) ) ;
1616const plumber = require ( 'gulp-plumber' ) ;
1717const ngAnnotate = require ( 'gulp-ng-annotate' ) ;
1818const insert = require ( 'gulp-insert' ) ;
You can’t perform that action at this time.
0 commit comments