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: cordova browserify/rollup conflict #3180

Merged
merged 1 commit into from Dec 29, 2022

Conversation

chmelevskij
Copy link
Member

@chmelevskij chmelevskij commented Dec 29, 2022

browserify seems to clash with rollup setup, remove browserify in favour of rollup.

If someone has OTG cable to verify would be great before merging.

Fixes:
Screenshot 2022-12-29 at 08 15 10

@chmelevskij
Copy link
Member Author

Noticed regression on #3001

@github-actions

This comment has been minimized.

@github-actions

This comment has been minimized.

@blckmn
Copy link
Member

blckmn commented Dec 29, 2022

AUTOMERGE: (FAIL)

  • github identifies PR as mergeable -> FAIL
  • assigned to a milestone -> PASS
  • 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 -> PASS
  • Tested label found -> FAIL
  • assigned to an approver -> PASS
  • approver count at least three -> FAIL

@McGiverGim
Copy link
Member

The OTG seems to be working, some tabs seems to fail, but I'm not sure if they failed before this PR.
Screenshot_20221229-125605

@chmelevskij
Copy link
Member Author

@McGiverGim Which tabs are failing?

browserify seems to clash with rollup setup, remove browserify in favour
of rollup.
@sonarcloud
Copy link

sonarcloud bot commented Dec 29, 2022

Kudos, SonarCloud Quality Gate passed!    Quality Gate passed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 0 Code Smells

No Coverage information No Coverage information
0.0% 0.0% Duplication

@@ -11,14 +11,12 @@ const del = require('del');
const NwBuilder = require('nw-builder');
const innoSetup = require('@quanle94/innosetup');
const deb = require('gulp-debian');
const conffiles = './test/configs';
Copy link
Member

Choose a reason for hiding this comment

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

This was added in #3155 - need to check if linux debian file is still being created.

UPDATE: Seems to be there. So all good.

Copy link
Member Author

Choose a reason for hiding this comment

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

This literally does nothing. Do you mean

conffiles: './test/configs/opt/etc/dummy.cfg',
is needed?

Copy link
Member

Choose a reason for hiding this comment

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

Yes according the example in the updated library

@github-actions
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!

@McGiverGim
Copy link
Member

@McGiverGim Which tabs are failing?

The RX tab didn't load for example. The OSD tab load but it's very ugly at least for HD but I'm pretty sure this was ugly before this PR.
I'm out for some days so I can't test more until my return.

@haslinghuis
Copy link
Member

haslinghuis commented Dec 29, 2022

  • Receiver tab stays loading on waiting for data on Android. But this is a broken for more then two weeks.
  • OSD is ugly on Nokia G60 but ok on Samsung Galaxy S7 (but that was before this PR)

@haslinghuis
Copy link
Member

@chmelevskij @McGiverGim Have found the PR which causes receiver tab bug: #3097

@blckmn blckmn merged commit 3d6a690 into betaflight:master Dec 29, 2022
Finalizing Firmware 4.4 Release automation moved this from In progress to Done Dec 29, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Development

Successfully merging this pull request may close these issues.

None yet

4 participants