1
0
Fork 0
mirror of https://github.com/betaflight/betaflight-configurator.git synced 2025-07-15 20:35:23 +03:00

fix gulp tasks such that yarn gets its lock file

Also stop npm 6 from being installed for travis-ci, for speedup reasons
This commit is contained in:
Kyle K 2019-07-27 03:33:02 +00:00
parent 7026bd25d2
commit 71320169da
2 changed files with 18 additions and 15 deletions

View file

@ -4,7 +4,7 @@ os:
sudo: false sudo: false
dist: trusty dist: bionic
addons: addons:
apt: apt:
@ -17,14 +17,11 @@ git:
language: node_js language: node_js
node_js: node_js:
- 8.11.2 - 10
addons: addons:
chrome: stable chrome: stable
before_install:
- npm i -g npm@6.0.1
script: script:
- yarn test - yarn test
- yarn gulp release - yarn gulp release

View file

@ -74,7 +74,8 @@ gulp.task('clean-cache', clean_cache);
const getChangesetId = gulp.series(getHash, writeChangesetId); const getChangesetId = gulp.series(getHash, writeChangesetId);
gulp.task('get-changeset-id', getChangesetId); gulp.task('get-changeset-id', getChangesetId);
var distBuild = gulp.series(dist_src, dist_locale, dist_libraries, dist_resources, getChangesetId); // dist_yarn MUST be done after dist_src
var distBuild = gulp.series(dist_src, dist_yarn, dist_locale, dist_libraries, dist_resources, getChangesetId);
var distRebuild = gulp.series(clean_dist, distBuild); var distRebuild = gulp.series(clean_dist, distBuild);
gulp.task('dist', distRebuild); gulp.task('dist', distRebuild);
@ -202,23 +203,23 @@ function getReleaseFilename(platform, ext) {
function clean_dist() { function clean_dist() {
return del([DIST_DIR + '**'], { force: true }); return del([DIST_DIR + '**'], { force: true });
}; }
function clean_apps() { function clean_apps() {
return del([APPS_DIR + '**'], { force: true }); return del([APPS_DIR + '**'], { force: true });
}; }
function clean_debug() { function clean_debug() {
return del([DEBUG_DIR + '**'], { force: true }); return del([DEBUG_DIR + '**'], { force: true });
}; }
function clean_release() { function clean_release() {
return del([RELEASE_DIR + '**'], { force: true }); return del([RELEASE_DIR + '**'], { force: true });
}; }
function clean_cache() { function clean_cache() {
return del(['./cache/**'], { force: true }); return del(['./cache/**'], { force: true });
}; }
// Real work for dist task. Done in another task to call it via // Real work for dist task. Done in another task to call it via
// run-sequence. // run-sequence.
@ -240,12 +241,17 @@ function dist_src() {
.pipe(gulp.src('manifest.json', { passthrougth: true })) .pipe(gulp.src('manifest.json', { passthrougth: true }))
.pipe(gulp.src('yarn.lock', { passthrougth: true })) .pipe(gulp.src('yarn.lock', { passthrougth: true }))
.pipe(gulp.src('changelog.html', { passthrougth: true })) .pipe(gulp.src('changelog.html', { passthrougth: true }))
.pipe(gulp.dest(DIST_DIR)) .pipe(gulp.dest(DIST_DIR));
}
// This function relies on files from the dist_src function
function dist_yarn() {
return gulp.src(['./dist/package.json', './dist/yarn.lock'])
.pipe(gulp.dest('./dist'))
.pipe(yarn({ .pipe(yarn({
production: true, production: true
ignoreScripts: true
})); }));
}; }
function dist_locale() { function dist_locale() {
return gulp.src('./locales/**/*', { base: 'locales'}) return gulp.src('./locales/**/*', { base: 'locales'})