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.

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

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

Merged
merged 2 commits into from Dec 20, 2023
Merged

Conversation

chmelevskij
Copy link
Member

@chmelevskij chmelevskij commented Dec 20, 2023

  • fixes dist/dist/dist/dist build bug
  • load in map.js for gps tab to work as expected

Resolves #3681

@chmelevskij chmelevskij changed the title Fix/ol Fix: maps and dist/dist/dist builds Dec 20, 2023
Copy link

sonarcloud bot commented Dec 20, 2023

Quality Gate Failed Quality Gate failed

Failed conditions

14.7% Duplication on New Code (required ≤ 3%)

See analysis details on SonarCloud

Copy link
Contributor

Do you want to test this code? Here you have an automated build:
Betaflight-Configurator-Android
Betaflight-Configurator-Linux
Betaflight-Configurator-macOS
Betaflight-Configurator-Windows
WARNING: It may be unstable and result in corrupted configurations or data loss. Use only for testing!

@blckmn
Copy link
Member

blckmn commented Dec 20, 2023

AUTOMERGE: (FAIL)

  • github identifies PR as mergeable -> FAIL
  • assigned to a milestone -> FAIL
  • cooling off period lapsed -> FAIL
  • commit count less or equal to three -> PASS
  • Don't merge label NOT found -> PASS
  • at least one RN: label found -> FAIL
  • Tested label found -> FAIL
  • assigned to an approver -> FAIL
  • approver count at least three -> FAIL

@@ -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

@haslinghuis haslinghuis added this to the 10.10.0 milestone Dec 20, 2023
@haslinghuis haslinghuis linked an issue Dec 20, 2023 that may be closed by this pull request
@haslinghuis haslinghuis merged commit daf7e4d into betaflight:master Dec 20, 2023
6 of 7 checks passed
@ctzsnooze
Copy link
Member

@chmelevskij - I'd be really grateful if you could possibly make a PR that would enable the 'satellite' or 'terrain' view of the map - is that possible?

chmelevskij added a commit to chmelevskij/betaflight-configurator that referenced this pull request Apr 27, 2024
* fix: load in `map.js`

* fix: clean dist before build
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Status: COMPLETED
Development

Successfully merging this pull request may close these issues.

GPS map not showing after PR 3597
6 participants