Skip to content

Commit 9289dd7

Browse files
joaomorenojoaomoreno
committed
remove yarn gulp electron
1 parent 5048816 commit 9289dd7

7 files changed

Lines changed: 12 additions & 21 deletions

File tree

‎build/azure-pipelines/darwin/continuous-build-darwin.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ steps:
2121
vstsFeed: '$(ArtifactFeed)'
2222
condition: and(succeeded(), ne(variables['CacheRestored'], 'true'))
2323
- script: |
24-
yarn gulp electron-x64
24+
yarn electron x64
2525
displayName: Download Electron
2626
- script: |
2727
yarn gulp hygiene --skip-tslint

‎build/azure-pipelines/linux/continuous-build-linux.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ steps:
2929
vstsFeed: '$(ArtifactFeed)'
3030
condition: and(succeeded(), ne(variables['CacheRestored'], 'true'))
3131
- script: |
32-
yarn gulp electron-x64
32+
yarn electron x64
3333
displayName: Download Electron
3434
- script: |
3535
yarn gulp hygiene --skip-tslint

‎build/azure-pipelines/win32/continuous-build-win32.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ steps:
2525
vstsFeed: '$(ArtifactFeed)'
2626
condition: and(succeeded(), ne(variables['CacheRestored'], 'true'))
2727
- powershell: |
28-
yarn gulp electron
28+
yarn electron
2929
- script: |
3030
yarn gulp hygiene --skip-tslint
3131
displayName: Run Hygiene Checks

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ steps:
107107
- powershell: |
108108
. build/azure-pipelines/win32/exec.ps1
109109
$ErrorActionPreference = "Stop"
110-
exec { yarn gulp "electron-$(VSCODE_ARCH)" }
110+
exec { yarn electron $(VSCODE_ARCH) }
111111
exec { .\scripts\test.bat --build --tfs "Unit Tests" }
112112
displayName: Run unit tests
113113
condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'))

‎build/gulpfile.vscode.js‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ const product = require('../product.json');
3030
const crypto = require('crypto');
3131
const i18n = require('./lib/i18n');
3232
const deps = require('./dependencies');
33-
const { getElectron, config } = require('./lib/electron');
33+
const { config } = require('./lib/electron');
3434
const createAsar = require('./lib/asar').createAsar;
3535
const minimist = require('minimist');
3636
const { compileBuildTask } = require('./gulpfile.compile');
@@ -113,14 +113,6 @@ const minifyVSCodeTask = task.define('minify-vscode', task.series(
113113
));
114114
gulp.task(minifyVSCodeTask);
115115

116-
// Package
117-
118-
gulp.task(task.define('electron', task.series(util.rimraf('.build/electron'), getElectron(process.arch))));
119-
gulp.task(task.define('electron-ia32', task.series(util.rimraf('.build/electron'), getElectron('ia32'))));
120-
gulp.task(task.define('electron-x64', task.series(util.rimraf('.build/electron'), getElectron('x64'))));
121-
gulp.task(task.define('electron-arm', task.series(util.rimraf('.build/electron'), getElectron('armv7l'))));
122-
gulp.task(task.define('electron-arm64', task.series(util.rimraf('.build/electron'), getElectron('arm64'))));
123-
124116
/**
125117
* Compute checksums for some files.
126118
*

‎build/lib/electron.js‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -98,19 +98,18 @@ function getElectron(arch) {
9898
.pipe(vfs.dest('.build/electron'));
9999
};
100100
}
101-
exports.getElectron = getElectron;
102-
async function main() {
101+
async function main(arch = process.arch) {
103102
const version = getElectronVersion();
104103
const electronPath = path.join(root, '.build', 'electron');
105104
const versionFile = path.join(electronPath, 'version');
106105
const isUpToDate = fs.existsSync(versionFile) && fs.readFileSync(versionFile, 'utf8') === `${version}`;
107106
if (!isUpToDate) {
108107
await util.rimraf(electronPath)();
109-
await util.streamToPromise(getElectron(process.arch)());
108+
await util.streamToPromise(getElectron(arch)());
110109
}
111110
}
112111
if (require.main === module) {
113-
main().catch(err => {
112+
main(process.argv[2]).catch(err => {
114113
console.error(err);
115114
process.exit(1);
116115
});

‎build/lib/electron.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ export const config = {
9090
repo: product.electronRepository || undefined
9191
};
9292

93-
export function getElectron(arch: string): () => NodeJS.ReadWriteStream {
93+
function getElectron(arch: string): () => NodeJS.ReadWriteStream {
9494
return () => {
9595
const electronOpts = _.extend({}, config, {
9696
platform: process.platform,
@@ -107,20 +107,20 @@ export function getElectron(arch: string): () => NodeJS.ReadWriteStream {
107107
};
108108
}
109109

110-
async function main(): Promise<void> {
110+
async function main(arch = process.arch): Promise<void> {
111111
const version = getElectronVersion();
112112
const electronPath = path.join(root, '.build', 'electron');
113113
const versionFile = path.join(electronPath, 'version');
114114
const isUpToDate = fs.existsSync(versionFile) && fs.readFileSync(versionFile, 'utf8') === `${version}`;
115115

116116
if (!isUpToDate) {
117117
await util.rimraf(electronPath)();
118-
await util.streamToPromise(getElectron(process.arch)());
118+
await util.streamToPromise(getElectron(arch)());
119119
}
120120
}
121121

122122
if (require.main === module) {
123-
main().catch(err => {
123+
main(process.argv[2]).catch(err => {
124124
console.error(err);
125125
process.exit(1);
126126
});

0 commit comments

Comments
 (0)