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 Appveyor CI to use NUT libmodbus fork #2778

Merged
merged 38 commits into from
Jan 23, 2025

Conversation

jimklimov
Copy link
Member

@jimklimov jimklimov commented Jan 20, 2025

Try to provide our libmodbus fork with our rtu_usb branch, so the built apc_modbus driver is as functional as possible.

Follows up from #2776

@jimklimov jimklimov added packaging Windows USB CI Entries related to continuous integration infrastructure (historically also recipes like Makefiles) modbus portability We want NUT to build and run everywhere possible labels Jan 20, 2025
@jimklimov jimklimov added this to the 2.8.3 milestone Jan 20, 2025
@jimklimov jimklimov force-pushed the fix-appveyor-libmodbus branch from d49262b to a9eba54 Compare January 20, 2025 20:13
@AppVeyorBot
Copy link

…w-build temporarily

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
…nges when checking remote Git for changes [networkupstools#1491]

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
… it exists before rebuild [networkupstools#1491]

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
…, use the custom-built one (like net-snmp)

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
…he script (whether we skip a component as already installed, or we fetch/build/install it [networkupstools#1491]

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
…and PREFIX, so they can be customized (e.g. for non-Windows prereq builds eventually) [networkupstools#1491]

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
…X with PREFIX_ROOT [networkupstools#1491]

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
…n-Windows targets [networkupstools#1491]

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
…so covered [networkupstools#1491]

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
… later)

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
…pt fails, print its config.log [networkupstools#1491]

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
@jimklimov jimklimov force-pushed the fix-appveyor-libmodbus branch from a9eba54 to be93552 Compare January 21, 2025 02:59
…nt variables [networkupstools#1491]

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
…from PREFIX

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
@AppVeyorBot
Copy link

…s and build-mingw-prereqs.sh [networkupstools#1491]

We are only sort of guaranteed to use ccache out of the box when arranged
by ci_build.sh, but might not benefit from it in other cases.

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
… and fit into the 1-hour time slot

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
@jimklimov jimklimov force-pushed the fix-appveyor-libmodbus branch from 0a34ac9 to 0901f35 Compare January 22, 2025 10:13
…n is not yet there

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
… PREFIX in tarball case

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
… PREFIX in gitrepo case

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
…ocation if present [networkupstools#1491]

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
…quisites and fit into the 1-hour time slot"

This reverts commit 0901f35.

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
… disable later)"

This reverts commit 24829c5.

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
@AppVeyorBot
Copy link

@jimklimov jimklimov force-pushed the fix-appveyor-libmodbus branch from 7a73cc4 to ee2d330 Compare January 22, 2025 14:37
…duction" install area [networkupstools#1491]

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
@jimklimov jimklimov force-pushed the fix-appveyor-libmodbus branch from ee2d330 to 9b09951 Compare January 22, 2025 14:51
@AppVeyorBot
Copy link

…or -liphlpapi

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
@jimklimov jimklimov force-pushed the fix-appveyor-libmodbus branch from 9b09951 to a2c9d4a Compare January 22, 2025 16:44
…-checks succeed

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
…us against libusb

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
…that libusb-1.0 is required by libmodbus with rtu_usb

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
…ant --with-modbus+usb=yes [networkupstools#1507]

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
@jimklimov jimklimov force-pushed the fix-appveyor-libmodbus branch from a2c9d4a to b6f2f82 Compare January 22, 2025 17:37
… fail, and finish with "date -u" to check how long "7z" takes subsequently

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
…s/BUILD_TYPE="" builds

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
@jimklimov jimklimov merged commit 4c00520 into networkupstools:master Jan 23, 2025
25 of 28 checks passed
@jimklimov jimklimov deleted the fix-appveyor-libmodbus branch January 23, 2025 10:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
CI Entries related to continuous integration infrastructure (historically also recipes like Makefiles) modbus packaging portability We want NUT to build and run everywhere possible USB Windows
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants