-
-
Notifications
You must be signed in to change notification settings - Fork 7.6k
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
Refactor vcpkg dependencies and get rid of thirdparty repos #6282
Conversation
basilgello
commented
Nov 4, 2023
- Fix build on android-x86 and rename function
- Add custom ports not (yet) in upstream vcpkg
- Refactor build_android_deps.sh
- Fix CI
👍 |
@rustdesk How do we trigger CI build for it? |
I think you can trigger nightly build or the other CI manually on your repo |
Please move vcpkg etc to |
I checked Actions tab - there is malformed YAML so the build failed at startup. Starting the fix round :) |
Moved vcpkg folder to res - vcpkg.json should stay in project root because there you declare project-wude dependsncies for all platforms. In manifest mode, vcpkg installs deps not into |
Thanks |
1453d02
to
bbcc034
Compare
Fixed :) |
bbcc034
to
beb8c15
Compare
@basilgello Great job. Have you run nightly build? since the regular CI does not run ios/arm-linux job. |
To run arm-linux, you must remove this line rustdesk/.github/workflows/flutter-build.yml Line 811 in 27112e3
we are using our selfhost runner for speed. |
This time cmake :) Why vcpkg lists only haf of basic deps needed? :) Will pr there too |
failed, :( |
Moment :) What a wild ride :D |
Failed, :) |
Dont cancel the whole run please - I want to make sure aarch64 and ipa build. I am spawning another test for arm-linux on aarch64 (I did test cross-building from x86_64 to arm-linyx so maybe I missed something) |
Got it. |
Ha, darwin (macos) decided it does not want to let DMG go :) Glitch |
:( |
Aaaand ios failed with totally unexpected error: https://github.com/rustdesk/rustdesk/actions/runs/6783095255/job/18436731959#step:12:99 It looks like we should not use linux bridge for macos either (but you warned me :) ) |
Looks like the opposite should be done to what I did in f0f52d7 Dont revert yourself, I will push all fixes in separate PR |
And very strange errors here: https://github.com/rustdesk/rustdesk/actions/runs/6783095255/job/18438768047#step:6:757 The library was successfully built, but prebuilt flutter can not be executed. That self-hosted runners - are they native aarch64 or amd64? Looks like they are native ARM and you use docker with amd64 to build rustdesk. Is that correct? EDIT: It appears they are amd64 baremetal but arm64 is run inside docker :) OK, time to spawn aarch64 runner ;) |
my self-hosted runner is aarch64. |
Not correct. we could not do such stupid thing. |
Aha, found why flutter-elinux was needed: flutter-elinux runs on aarch64 while official flutter does not :) The only question for now is libvpx cross-compiled frpm arm64-linyx to arm-linux. |
I noticed you removed elinux, I thought you got better solution, so did not warn you. |
I likely mixed removing this: rustdesk/.github/workflows/flutter-build.yml Line 1445 in 97aeee7
|
Pushed the reverts, and the only remaining thing is libvpx ( again :( ) |
apk is unusable because prebuilt liboboe.a from thirdparty_lib was silently patched with |
#6325 if CI passes :) |
For macos failure, I will do follow-up PR. Android APKs are useful again :) Sciter-armv7 needs another iteration from me - vcpkg produces valid armv7 static libs (I tested this morning) but rust toolchain links something weird. Will spawn another runner ;) |
Let me clean cache and try again. |
#6358 for test - merge, start nightly build and revert afterwards :) Otherwise I cant reproduce the faulty rlib :( |
@basilgello I'm not able to install the nightly .rpm build on fedora. $ sudo dnf localinstall rustdesk-1.2.4-0.x86_64.rpm
Last metadata expiration check: 2:06:09 ago on Sunday 12 November 2023 02:19:17 AM.
Error:
Problem: conflicting requests
- nothing provides libfile_selector_linux_plugin.so()(64bit) needed by rustdesk-1.2.4-0.x86_64 from @commandline
(try to add '--skip-broken' to skip uninstallable packages) No problem with 1.2.3. |
The library is inside the rpm @sahilyeole :) Trying to understand why rpm declared it as external dependency. |
[root@82e5b92284ec /]# diff -ru --color requires.*
--- requires.123 2023-10-13 00:00:00.000000000 +0000
+++ requires.124 2023-11-12 00:00:00.000000000 +0000
@@ -16,6 +16,7 @@
libdesktop_multi_window_plugin.so()(64bit)
libdl.so.2()(64bit)
libdl.so.2(GLIBC_2.2.5)(64bit)
+libfile_selector_linux_plugin.so()(64bit)
libflutter_custom_cursor_plugin.so()(64bit)
libflutter_linux_gtk.so()(64bit)
libgcc_s.so.1()(64bit) |
@sahilyeole #6384 :) |