run mixin before yarn

build/azure-pipelines/darwin/product-build-darwin.yml

@@ -18,9 +18,15 @@ steps:
     password $(VSCODE_MIXIN_PASSWORD)
     EOF
 
+    git config user.email "vscode@microsoft.com"
+    git config user.name "VSCode"
+    git remote add distro "https://github.com/$(VSCODE_MIXIN_REPO).git"
+    git fetch distro
+    git merge $(node -p "require('./package.json').distro")
+
     yarn
-    VSCODE_MIXIN_PASSWORD="$(VSCODE_MIXIN_PASSWORD)" yarn gulp -- mixin
-    yarn gulp -- hygiene
+    yarn gulp mixin
+    yarn gulp hygiene
     yarn monaco-compile-check
     node build/azure-pipelines/common/installDistro.js
     node build/lib/builtInExtensions.js
@@ -30,10 +36,10 @@ steps:
     set -e
     VSCODE_MIXIN_PASSWORD="$(VSCODE_MIXIN_PASSWORD)" \
     AZURE_STORAGE_ACCESS_KEY="$(AZURE_STORAGE_ACCESS_KEY)" \
-    yarn gulp -- vscode-darwin-min
+    yarn gulp vscode-darwin-min
     VSCODE_MIXIN_PASSWORD="$(VSCODE_MIXIN_PASSWORD)" \
     AZURE_STORAGE_ACCESS_KEY="$(AZURE_STORAGE_ACCESS_KEY)" \
-    yarn gulp -- upload-vscode-sourcemaps
+    yarn gulp upload-vscode-sourcemaps
   displayName: Build
 
 - script: |
@@ -97,7 +103,7 @@ steps:
 
     # upload configuration
     AZURE_STORAGE_ACCESS_KEY="$(AZURE_STORAGE_ACCESS_KEY)" \
-    yarn gulp -- upload-vscode-configuration
+    yarn gulp upload-vscode-configuration
   displayName: Publish
 
 - task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0

build/azure-pipelines/linux/product-build-linux.yml

@@ -22,21 +22,27 @@ steps:
     password $(VSCODE_MIXIN_PASSWORD)
     EOF
 
+    git config user.email "vscode@microsoft.com"
+    git config user.name "VSCode"
+    git remote add distro "https://github.com/$(VSCODE_MIXIN_REPO).git"
+    git fetch distro
+    git merge $(node -p "require('./package.json').distro")
+
     CHILD_CONCURRENCY=1 yarn
-    VSCODE_MIXIN_PASSWORD="$(VSCODE_MIXIN_PASSWORD)" npm run gulp -- mixin
-    npm run gulp -- hygiene
-    npm run monaco-compile-check
+    yarn gulp mixin
+    yarn gulp hygiene
+    yarn monaco-compile-check
     node build/azure-pipelines/common/installDistro.js
     node build/lib/builtInExtensions.js
 
 - script: |
     set -e
-    VSCODE_MIXIN_PASSWORD="$(VSCODE_MIXIN_PASSWORD)" npm run gulp -- vscode-linux-$(VSCODE_ARCH)-min
+    VSCODE_MIXIN_PASSWORD="$(VSCODE_MIXIN_PASSWORD)" yarn gulp vscode-linux-$(VSCODE_ARCH)-min
   name: build
 
 - script: |
     set -e
-    npm run gulp -- "electron-$(VSCODE_ARCH)"
+    yarn gulp "electron-$(VSCODE_ARCH)"
 
     # xvfb seems to be crashing often, let's make sure it's always up
     service xvfb start
@@ -74,7 +80,7 @@ steps:
     node build/azure-pipelines/common/symbols.js "$(VSCODE_MIXIN_PASSWORD)" "$(VSCODE_HOCKEYAPP_TOKEN)" "$(VSCODE_ARCH)" "$(VSCODE_HOCKEYAPP_ID_LINUX64)"
 
     # Publish DEB
-    npm run gulp -- "vscode-linux-$(VSCODE_ARCH)-build-deb"
+    yarn gulp "vscode-linux-$(VSCODE_ARCH)-build-deb"
     PLATFORM_DEB="linux-deb-$ARCH"
     [[ "$ARCH" == "ia32" ]] && DEB_ARCH="i386" || DEB_ARCH="amd64"
     DEB_FILENAME="$(ls $REPO/.build/linux/deb/$DEB_ARCH/deb/)"
@@ -85,7 +91,7 @@ steps:
     node build/azure-pipelines/common/publish.js "$VSCODE_QUALITY" "$PLATFORM_DEB" package "$DEB_FILENAME" "$VERSION" true "$DEB_PATH"
 
     # Publish RPM
-    npm run gulp -- "vscode-linux-$(VSCODE_ARCH)-build-rpm"
+    yarn gulp "vscode-linux-$(VSCODE_ARCH)-build-rpm"
     PLATFORM_RPM="linux-rpm-$ARCH"
     [[ "$ARCH" == "ia32" ]] && RPM_ARCH="i386" || RPM_ARCH="x86_64"
     RPM_FILENAME="$(ls $REPO/.build/linux/rpm/$RPM_ARCH/ | grep .rpm)"
@@ -96,7 +102,7 @@ steps:
     node build/azure-pipelines/common/publish.js "$VSCODE_QUALITY" "$PLATFORM_RPM" package "$RPM_FILENAME" "$VERSION" true "$RPM_PATH"
 
     # Publish Snap
-    npm run gulp -- "vscode-linux-$(VSCODE_ARCH)-prepare-snap"
+    yarn gulp "vscode-linux-$(VSCODE_ARCH)-prepare-snap"
 
     # Pack snap tarball artifact, in order to preserve file perms
     mkdir -p $REPO/.build/linux/snap-tarball

build/azure-pipelines/win32/product-build-win32.yml

@@ -18,11 +18,17 @@ steps:
     "machine monacotools.visualstudio.com`npassword $(VSO_PAT)`nmachine github.com`nlogin vscode`npassword $(VSCODE_MIXIN_PASSWORD)" | Out-File "$env:USERPROFILE\_netrc" -Encoding ASCII
     $env:npm_config_arch="$(VSCODE_ARCH)"
     $env:CHILD_CONCURRENCY="1"
-    $env:VSCODE_MIXIN_PASSWORD="$(VSCODE_MIXIN_PASSWORD)"
+
+    exec { git config user.email "vscode@microsoft.com" }
+    exec { git config user.name "VSCode" }
+    exec { git remote add distro "https://github.com/$(VSCODE_MIXIN_REPO).git" }
+    exec { git fetch distro }
+    exec { git merge $(node -p "require('./package.json').distro") }
+
     exec { yarn }
-    exec { npm run gulp -- mixin }
-    exec { npm run gulp -- hygiene }
-    exec { npm run monaco-compile-check }
+    exec { yarn gulp mixin }
+    exec { yarn gulp hygiene }
+    exec { yarn monaco-compile-check }
     exec { node build/azure-pipelines/common/installDistro.js }
     exec { node build/lib/builtInExtensions.js }
 
@@ -30,14 +36,14 @@ steps:
     . build/azure-pipelines/win32/exec.ps1
     $ErrorActionPreference = "Stop"
     $env:VSCODE_MIXIN_PASSWORD="$(VSCODE_MIXIN_PASSWORD)"
-    exec { npm run gulp -- "vscode-win32-$(VSCODE_ARCH)-min" }
-    exec { npm run gulp -- "vscode-win32-$(VSCODE_ARCH)-inno-updater" }
+    exec { yarn gulp "vscode-win32-$(VSCODE_ARCH)-min" }
+    exec { yarn gulp "vscode-win32-$(VSCODE_ARCH)-inno-updater" }
   name: build
 
 - powershell: |
     . build/azure-pipelines/win32/exec.ps1
     $ErrorActionPreference = "Stop"
-    exec { npm run gulp -- "electron-$(VSCODE_ARCH)" }
+    exec { yarn gulp "electron-$(VSCODE_ARCH)" }
     exec { .\scripts\test.bat --build --tfs "Unit Tests" }
     # yarn smoketest -- --build "$(agent.builddirectory)\VSCode-win32-$(VSCODE_ARCH)"
   displayName: Unit tests
@@ -45,7 +51,7 @@ steps:
 - powershell: |
     . build/azure-pipelines/win32/exec.ps1
     $ErrorActionPreference = "Stop"
-    exec { npm run gulp -- "electron-$(VSCODE_ARCH)" }
+    exec { yarn gulp "electron-$(VSCODE_ARCH)" }
     exec { .\scripts\test-integration.bat --build --tfs "Integration Tests" }
   displayName: Integration tests
 
@@ -126,7 +132,7 @@ steps:
 - powershell: |
     . build/azure-pipelines/win32/exec.ps1
     $ErrorActionPreference = "Stop"
-    exec { npm run gulp -- "vscode-win32-$(VSCODE_ARCH)-archive" "vscode-win32-$(VSCODE_ARCH)-system-setup" "vscode-win32-$(VSCODE_ARCH)-user-setup" --sign }
+    exec { yarn gulp "vscode-win32-$(VSCODE_ARCH)-archive" "vscode-win32-$(VSCODE_ARCH)-system-setup" "vscode-win32-$(VSCODE_ARCH)-user-setup" --sign }
 
     $Repo = "$(pwd)"
     $Root = "$Repo\.."

build/gulpfile.mixin.js

@@ -11,19 +11,10 @@ const buffer = require('gulp-buffer');
 const filter = require('gulp-filter');
 const es = require('event-stream');
 const vfs = require('vinyl-fs');
-const pkg = require('../package.json');
-const cp = require('child_process');
 const fancyLog = require('fancy-log');
 const ansiColors = require('ansi-colors');
 
 gulp.task('mixin', function () {
-	const repo = process.env['VSCODE_MIXIN_REPO'];
-
-	if (!repo) {
-		console.log('Missing VSCODE_MIXIN_REPO, skipping mixin');
-		return;
-	}
-
 	const quality = process.env['VSCODE_QUALITY'];
 
 	if (!quality) {
@@ -31,26 +22,6 @@ gulp.task('mixin', function () {
 		return;
 	}
 
-	const url = `https://github.com/${repo}.git`;
-
-	cp.execSync(`git config user.email "vscode@microsoft.com"`);
-	cp.execSync(`git config user.name "VSCode"`);
-
-	fancyLog(ansiColors.blue('[mixin]'), 'Add distro remote');
-	cp.execSync(`git remote add distro ${url}`);
-
-	fancyLog(ansiColors.blue('[mixin]'), 'Add fetch distro sources');
-	cp.execSync(`git fetch distro`);
-
-	fancyLog(ansiColors.blue('[mixin]'), `Merge ${pkg.distro} from distro`);
-
-	try {
-		cp.execSync(`git merge ${pkg.distro}`);
-	} catch (err) {
-		fancyLog(ansiColors.red('[mixin] ❌'), `Failed to merge ${pkg.distro} from distro. Please proceed with manual merge to fix the build.`);
-		throw err;
-	}
-
 	const productJsonFilter = filter('product.json', { restore: true });
 
 	fancyLog(ansiColors.blue('[mixin]'), `Mixing in sources:`);