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
39
39
var_6 : &npm_install
40
40
run : npm ci
41
41
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
46
43
store_test_results :
47
44
path : ./artifacts/junit
48
45
49
46
# Branch filter that we can specify for jobs that should only run on publish branches. This filter
50
47
# is used to ensure that not all upstream branches will be published as Github builds
51
48
# (e.g. revert branches, feature branches)
52
- var_9 : &publish_branches_filter
49
+ var_8 : &publish_branches_filter
53
50
branches :
54
51
only :
55
52
- master
93
90
- checkout_and_rebase
94
91
- *restore_cache
95
92
- *npm_install
96
- - *rebuild_node_sass
97
93
- run : npm run lint
98
94
99
95
# -----------------------------------
@@ -105,7 +101,6 @@ jobs:
105
101
- checkout_and_rebase
106
102
- *restore_cache
107
103
- *npm_install
108
- - *rebuild_node_sass
109
104
- run : npm run build
110
105
- *save_cache
111
106
Original file line number Diff line number Diff line change @@ -8,7 +8,7 @@ const lazypipe = require('lazypipe');
8
8
const mkdirp = require ( 'mkdirp' ) ;
9
9
const ngHtml2js = require ( 'gulp-ng-html2js' ) ;
10
10
const path = require ( 'path' ) ;
11
- const sass = require ( 'gulp-sass' ) ;
11
+ const sass = require ( 'gulp-sass' ) ( require ( 'sass' ) ) ;
12
12
const through2 = require ( 'through2' ) ;
13
13
const uglify = require ( 'gulp-uglify' ) ;
14
14
const utils = require ( '../scripts/gulp-utils.js' ) ;
Original file line number Diff line number Diff line change @@ -7,7 +7,7 @@ const fs = require('fs');
7
7
const path = require ( 'path' ) ;
8
8
const through2 = require ( 'through2' ) ;
9
9
const lazypipe = require ( 'lazypipe' ) ;
10
- const sass = require ( 'gulp-sass' ) ;
10
+ const sass = require ( 'gulp-sass' ) ( require ( 'sass' ) ) ;
11
11
const gulpif = require ( 'gulp-if' ) ;
12
12
const _ = require ( 'lodash' ) ;
13
13
Original file line number Diff line number Diff line change @@ -7,7 +7,7 @@ const concat = require('gulp-concat');
7
7
const series = require ( 'stream-series' ) ;
8
8
const util = require ( '../util' ) ;
9
9
const sassUtils = require ( '../../scripts/gulp-utils' ) ;
10
- const sass = require ( 'gulp-sass' ) ;
10
+ const sass = require ( 'gulp-sass' ) ( require ( 'sass' ) ) ;
11
11
const insert = require ( 'gulp-insert' ) ;
12
12
const gulpif = require ( 'gulp-if' ) ;
13
13
const minifyCss = util . minifyCss ;
Original file line number Diff line number Diff line change @@ -12,7 +12,7 @@ const series = require('stream-series');
12
12
const lazypipe = require ( 'lazypipe' ) ;
13
13
const glob = require ( 'glob' ) . sync ;
14
14
const uglify = require ( 'gulp-uglify' ) ;
15
- const sass = require ( 'gulp-sass' ) ;
15
+ const sass = require ( 'gulp-sass' ) ( require ( 'sass' ) ) ;
16
16
const plumber = require ( 'gulp-plumber' ) ;
17
17
const ngAnnotate = require ( 'gulp-ng-annotate' ) ;
18
18
const insert = require ( 'gulp-insert' ) ;
You can’t perform that action at this time.
0 commit comments