Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix: maps and dist/dist/dist builds #3682

Merged
merged 2 commits into from
Dec 20, 2023
Merged

Fix: maps and dist/dist/dist builds #3682

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
67b38cd
fix: load in `map.js`
chmelevskij Dec 20, 2023
2bd155e
fix: clean dist before build
chmelevskij Dec 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion gulpfile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ gulp.task('apps', appsBuild);
const debugAppsBuild = gulp.series(gulp.parallel(clean_debug, gulp.series(clean_dist, debugDistBuild)), debug, gulp.series(cordova_apps(false)), gulp.parallel(listPostBuildTasks(DEBUG_DIR)));

const debugBuildNoStart = gulp.series(debugDistBuild, debug, gulp.parallel(listPostBuildTasks(DEBUG_DIR)));
const debugBuild = gulp.series(debugBuildNoStart, start_debug);
const debugBuild = gulp.series(clean_dist, debugBuildNoStart, start_debug);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The clean_dist was removed from the debug build to accelerate the build while testing. There isn't a better fix?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This step takes only one or two seconds on my system.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i don't mind cleaning as well. my alias command does this manually, nice to return, imho.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We can do any optimization after we fix this bug.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The problem is not the clean_dist command, at least before the change, the rest of the debugBuild was a lot faster if the files were there and a lot slower if it must start from scratch. I don't know if this applies to the current version, the build has changed a lot since then.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

More info here: #1144

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yarn && yarn start the second times takes about 10 seconds here.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

that's fair too. i;ve not seen problems, since i always force a clean. this line can be reverted if desired.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Then we get the repeating dist dist dist issue

gulp.task('debug', debugBuild);
gulp.task('debug-no-start', debugBuildNoStart);

Expand Down Expand Up @@ -360,6 +360,7 @@ function dist_src() {
'!./src/support/**',
'!./src/**/*.less',
'./src/js/workers/hex_parser.js',
'./src/js/tabs/map.js',
];

return gulp.src(distSources, { base: 'src' })
Expand Down