diff --git a/build/azure-pipelines/darwin/product-build-darwin.yml b/build/azure-pipelines/darwin/product-build-darwin.yml index cdf7eb2f1df5f6dfbf9261eafebab000b3e3fcee..d8b2c009c4a0a970749f5dfdaced4838b6d392b6 100644 --- a/build/azure-pipelines/darwin/product-build-darwin.yml +++ b/build/azure-pipelines/darwin/product-build-darwin.yml @@ -79,7 +79,7 @@ steps: - script: | set -e - yarn gulp mixin + node build/azure-pipelines/mixin displayName: Mix in quality - script: | diff --git a/build/azure-pipelines/linux/product-build-linux-multiarch.yml b/build/azure-pipelines/linux/product-build-linux-multiarch.yml index 66b6bbff7130fe6874fc70316fe08aa30a3f8a47..c4e1e05e502d88a8c9018e0759982f2ccd9f3bc0 100644 --- a/build/azure-pipelines/linux/product-build-linux-multiarch.yml +++ b/build/azure-pipelines/linux/product-build-linux-multiarch.yml @@ -88,7 +88,7 @@ steps: - script: | set -e - yarn gulp mixin + node build/azure-pipelines/mixin displayName: Mix in quality - script: | diff --git a/build/azure-pipelines/linux/product-build-linux.yml b/build/azure-pipelines/linux/product-build-linux.yml index 1e48713cd868265062d3200ce72e2bb00e46ff43..76c86e323239383ca37e78bd20b32b995507b64d 100644 --- a/build/azure-pipelines/linux/product-build-linux.yml +++ b/build/azure-pipelines/linux/product-build-linux.yml @@ -80,7 +80,7 @@ steps: - script: | set -e - yarn gulp mixin + node build/azure-pipelines/mixin displayName: Mix in quality - script: | diff --git a/build/gulpfile.mixin.js b/build/azure-pipelines/mixin.js similarity index 93% rename from build/gulpfile.mixin.js rename to build/azure-pipelines/mixin.js index a2b61d33ad35603e26aa75c11240a7768c272574..efb7d4d1ca94b2af2430f4e1c66a824235329929 100644 --- a/build/gulpfile.mixin.js +++ b/build/azure-pipelines/mixin.js @@ -5,7 +5,6 @@ 'use strict'; -const gulp = require('gulp'); const json = require('gulp-json-editor'); const buffer = require('gulp-buffer'); const filter = require('gulp-filter'); @@ -14,7 +13,7 @@ const vfs = require('vinyl-fs'); const fancyLog = require('fancy-log'); const ansiColors = require('ansi-colors'); -gulp.task('mixin', function () { +function main() { const quality = process.env['VSCODE_QUALITY']; if (!quality) { @@ -36,5 +35,7 @@ gulp.task('mixin', function () { fancyLog(ansiColors.blue('[mixin]'), f.relative, ansiColors.green('✔︎')); return f; })) - .pipe(gulp.dest('.')); -}); \ No newline at end of file + .pipe(vfs.dest('.')); +} + +main(); \ No newline at end of file diff --git a/build/azure-pipelines/product-compile.yml b/build/azure-pipelines/product-compile.yml index cc2639f139cd5a32656481470f2e981445809d2e..25ba5a3e9bb775b8d7b240f8d7931d98be011edf 100644 --- a/build/azure-pipelines/product-compile.yml +++ b/build/azure-pipelines/product-compile.yml @@ -82,7 +82,7 @@ steps: # inline small SVGs - script: | set -e - yarn gulp mixin + node build/azure-pipelines/mixin displayName: Mix in quality condition: and(succeeded(), ne(variables['CacheRestored-Compilation'], 'true')) diff --git a/build/azure-pipelines/win32/product-build-win32.yml b/build/azure-pipelines/win32/product-build-win32.yml index 66d8bf4af32142c7433c92006a70cdb8e29b9fa4..fc14cc0abec9f66e0689a3ce61eaf3c50514aa44 100644 --- a/build/azure-pipelines/win32/product-build-win32.yml +++ b/build/azure-pipelines/win32/product-build-win32.yml @@ -89,7 +89,7 @@ steps: - powershell: | . build/azure-pipelines/win32/exec.ps1 $ErrorActionPreference = "Stop" - exec { yarn gulp mixin } + exec { node build/azure-pipelines/mixin } displayName: Mix in quality - powershell: |