FTY remerge from master as of 20251125 #3200
Merged
+12,371
−5,547
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…me now expected by scripts/python/module/Makefile.am [networkupstools#3130] Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
…kupstools#3130] Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
Older releases are deprecated and to be removed in November: * https://circleci.com/changelog/deprecation-of-eol-xcode-versions/ * https://circleci.com/changelog/images/#filtered Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
…et specifically for this script Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
…client runs [networkupstools#3130] Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
…ided one) as explicit interpreter [networkupstools#3130] CircleCI does see the correct shebang and the script as executable, but apparently tries to call it as a shell script and fails. Maybe /Users/distiller/.pyenv/shims/python3.13 is broken though?.. Or we hit NixOS/nixpkgs#65351 ? Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
…tworkupstools#3130] Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
…s fallback interpreter [networkupstools#3130] Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
…#1209, networkupstools#1316, networkupstools#3144] Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
Follow https://openbuildservice.org/2021/05/31/scm-integration/ instructions Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
Revised docs at https://openbuildservice.org/help/manuals/obs-user-guide/cha-obs-scm-ci-workflow-integration#sec.obs.obs_scm_ci_workflow_integration.setup.token_authentication.how_to_authenticate_scm_with_obs Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
CI: upstream OBS recipes from FTY branch
Some fixes after recent PR merges
…for now, and expand workflows for PRs, master iterations and tag releases [networkupstools#1209] Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
…d, fall back to the other value we had in mind [networkupstools#3136] In libusb1.c also fix printout of rdlen variables from %d to %PRIi32 Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
…dog instead of long quietness when shutting down [networkupstools#3003] Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
Signed-off-by: Atanas Vladimirov <vladimirov.atanas@gmail.com>
…fferent features are supported Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
…E_EXTEND_TIMEOUT` option and relevant variables [networkupstools#3003] Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
…protect from systemd or similar framework killing us by timeout [networkupstools#3033] Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
…MD_DAEMON_TIMEOUT_STOP_UPSMON substitution [networkupstools#3003] Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
…ealpower [networkupstools#3154] Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
…ext_device" now that we have a loop and "continue" to try another rdlen [networkupstools#3136] Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
docs/man/nutdrv_qx.txt: Fix the formatting of VOLTRONIC-AXPERT UNITS
Add SNMP info for ups.realpower for Cyberpower UPS
Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
jimklimov
added
the
DMF
Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
…es [networkupstools#3196] Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
…e-quotes [networkupstools#3196] Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
… script syntax with backticks and double-quotes; convert to use TOUPPER/TOLOWER detected methods [networkupstools#3196] Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
…d double-quotes; single-quote Make variable expansions into shell [networkupstools#3196] Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
…her "snmp-ups-dmf" or "snmp-ups-old" depending on binary build type [networkupstools#3101] 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>
|
✅ Build nut 2.8.4.3805-FTY completed (commit 200a043721 by @jimklimov) |
…snmp-ups{,-old,-dmf}
Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
…ster Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
…of 2025-11-25 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>
Member
Author
|
Now the remaining difference between FTY and master branches seems to be all about the DMF feature (and maybe a few miniscule differences like #2476). |
|
❌ Build nut 2.8.4.3806-FTY failed (commit 3f365ba0a5 by @jimklimov) |
Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
jimklimov
force-pushed
the
FTY-remerge-20251125
branch
from
4c091e5 to
9ef9f92
Compare
|
✅ Build nut 2.8.4.3808-FTY completed (commit 9627ea6402 by @jimklimov) |
Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
…rades or non-disruptive tests" from "Prerequisites for building NUT on different OSes" as the two chapters are closely coupled Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Catch up with development in upstream NUT v2.8.5 (to be) cycle.