Skip to content

Fix build/test errors after recent merges - #3786

Merged
jimklimov merged 13 commits into
networkupstools:masterfrom
jimklimov:issue-3668
Oct 21, 2026
Merged

Fix build/test errors after recent merges#3786
jimklimov merged 13 commits into
networkupstools:masterfrom
jimklimov:issue-3668

Conversation

@jimklimov

@jimklimov jimklimov commented Oct 20, 2026

Copy link
Copy Markdown
Member

@jimklimov
appveyor.yml, .github/scripts/appveyor/02-install.bat: use standard C…
aeb32d0 
…CACHE_MAXSIZE envvar if possible [networkupstools#3754]

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
@jimklimov
docs/man/Makefile.am: refactor with DOCBUILD_MAN
bb3e3b8 
Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
@jimklimov jimklimov added this to the 2.8.6 milestone Oct 20, 2026
@jimklimov jimklimov added bug CI Entries related to continuous integration infrastructure (here CI = tools + scripts + recipes) labels Oct 20, 2026
@github-actions

github-actions Bot commented Oct 20, 2026 •
edited
Loading

Copy link
Copy Markdown

A ZIP file with standard source tarball and another tarball with pre-built docs for commit fc1442b is temporarily available: NUT-tarballs-PR-3786.zip.

This was referenced Oct 20, 2026
Open
Merged
@jimklimov
docs/man/Makefile.am: DOCBUILD_MAN: throttle parallel builds on FreeB…
79d53c5 
…SD :\

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
@jimklimov
tests/parseconf-test.c: fix variable declaration style [networkupstoo…
d814ac7 
…ls#3633]

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
@jimklimov
tests/upsset-string-test.py: use a common default_timeout=30 (sec) fo…
c679671 
…r stressed CI builders [networkupstools#3668]

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
@jimklimov
tests/upsset-string-test.py: mock web-server better [networkupstools#…
0bcab02 
…3668]

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
@jimklimov
tests/upsset-string-test.py: make sure upsset.cgi is always executed [n…
3b09fbe 
…etworkupstools#3668]

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
@jimklimov
tests/upsset-string-test.py: honour NUT_DEBUG_LEVEL [networkupstools#…
3e73629 
…3668]

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
@jimklimov
tests/upsset-string-test.py: pass NUT_AUTHCONF_PATH to avoid confusio…
c78b61f 
…n with testing user config [networkupstools#3668]

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
@jimklimov
tests/upsset-string-test.py: use subprocess.Popen() for finer debuggi…
41a5726 
…ng [networkupstools#3668]

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
@jimklimov
clients/upsset.c: savesettings(): init desc=NULL to avoid bogus free() [
2cca742 
networkupstools#3668]

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
@jimklimov
docs/man/Makefile.am: recover (once) from broken man page builds on f…
0bc848a 
…reebsd with parallel builds

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
@github-actions github-actions Bot deleted a comment from AppVeyorBot Oct 20, 2026
@github-actions github-actions Bot deleted a comment from AppVeyorBot Oct 20, 2026
@nmbro

nmbro commented Oct 20, 2026

Copy link
Copy Markdown
Contributor

CCACHE_MAXSIZE is what makes the cap work: in recent AppVeyor logs, only builds of commits with it (e.g. 0fb20df, 8a2213b) show the 0.7 GiB max; all others show 5 GiB.

The ccache -o ... calls on the 02-install.bat line never run: cmd.exe ignores single quotes, so the first || is cmd's operator. bash only gets ... ; ccache -sv, and cmd skips the rest (including the new if ... fi). Repro: bash -lc 'echo A ; true || echo B ; echo C ' in a .bat prints only A.

Suggested line without || (sloppiness=file_macro was removed in ccache 3.7.6):

C:\msys64\usr\bin\bash -lc 'PATH="/mingw64/bin:$PATH" ; export PATH ; pwd ; if ! ccache -sv ; then echo "SKIP: Could not query ccache stats" ; fi ; ccache -o compression=true ; echo "ccache settings: max_size=`ccache -k max_size` compression=`ccache -k compression`" ; true '

Why it matters: uncapped, the .ccache entry grew ~155 MB per master push until AppVeyor refused to save it ("Compressed cache item cannot exceed 1,048,576,000 bytes"); the next build then restored no ccache at all and compiled cold. ccache also overshoots max_size (~120% seen), so a ccache -c before the cache save helps.

Lines in 05, 07 and 08 have the same || issue; I have a branch fixing those (plus ccache -c, parallel make check, faster artifact 7z) to open as a separate PR.

AI disclosure: prepared with Claude Code (Claude Opus 5.5), reviewed by me.

nmbro
nmbro reviewed Oct 20, 2026
View reviewed changes
Comment thread .github/scripts/appveyor/02-install.bat Outdated
nmbro added a commit to nmbro/nut that referenced this pull request Oct 20, 2026
@nmbro
ci(appveyor): fix cmd-eaten "||", stop PR cache saves
9d4ad0c 
cmd.exe ignores single quotes, so "||" inside bash -lc '...' is
cmd's operator: bash got only the left side, the rest ran in cmd
or was silently dropped.

- 05/07/08: use "if ! a ; then b ; fi" instead of "||"; note the
  pitfall in appveyor.yml
- 07: dump test logs in the same bash call, keep the real exit
  code (e.g. 124 from timeout), run make check with -j 2
- 08: drop dead symlink/find line; 7z -mx=3 -mmt=on (default
  level took ~3.8 min)
- 04, new 12-on_success: run ccache -c before the cache save;
  ccache overshoots max_size (~120%), and an entry over AppVeyor's
  per-item limit is not saved, so the next build starts cold
- 03: zero ccache stats so reports count this build only
- 12-on_success.ps1: post per-build ccache stats as a job message
  (shown in the GitHub notification of passed builds)
- init: skip cache save in PR builds (one cache per project, each
  PR build evicted master objects and re-uploaded ~1 GB); save on
  error only for master pushes

Assumes networkupstools#3786 lands with the suggested 02-install.bat line.
Refs networkupstools#3786

Signed-off-by: nmbro <nmbro@users.noreply.github.com>
nmbro added a commit to nmbro/nut that referenced this pull request Oct 20, 2026
@nmbro
ci(appveyor): fix cmd-eaten "||", stop PR cache saves
d54560c 
cmd.exe ignores single quotes, so "||" inside bash -lc '...' is
cmd's operator: bash got only the left side, the rest ran in cmd
or was silently dropped.

- 05/07/08: use "if ! a ; then b ; fi" instead of "||"; note the
  pitfall in appveyor.yml
- 07: dump test logs in the same bash call, keep the real exit
  code (e.g. 124 from timeout), run make check with -j 2
- 08: drop dead symlink/find line; 7z -mx=3 -mmt=on (default
  level took ~3.8 min)
- 04, new 12-on_success.ps1: run ccache -c before the cache save;
  ccache overshoots max_size (~120%), and an entry over AppVeyor's
  per-item limit is not saved, so the next build starts cold
- 03: zero ccache stats so reports count this build only
- 12-on_success.ps1: also post per-build ccache stats as a job message
  (shown in the GitHub notification of passed builds)
- init: skip cache save in PR builds (one cache per project, each
  PR build evicted master objects and re-uploaded ~1 GB); save on
  error only for master pushes

Assumes networkupstools#3786 lands with the suggested 02-install.bat line.
Refs networkupstools#3786

Signed-off-by: nmbro <nmbro@users.noreply.github.com>
@nmbro nmbro mentioned this pull request Oct 20, 2026
Merged
@jimklimov @nmbro
.github/scripts/appveyor/02-install.bat: fix cmd+bash syntax [network…
fc1442b 
…upstools#3786, networkupstools#3790]


Signed-off-by: nmbro <nmbro@users.noreply.github.com>
Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>

Co-authored-by: Nicolai Brogaard <nmb@minserver.dk>
@github-actions github-actions Bot deleted a comment from AppVeyorBot Oct 21, 2026
@AppVeyorBot

AppVeyorBot commented Oct 21, 2026

Copy link
Copy Markdown

✅ Build nut 2.8.5.5831-master completed (commit cf5bd0eb0a by @jimklimov)

@jimklimov
jimklimov merged commit 1704577 into networkupstools:master Oct 21, 2026
54 of 56 checks passed
@jimklimov
jimklimov deleted the issue-3668 branch October 21, 2026 14:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer
@nmbro nmbro nmbro left review comments
Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

bug CI Entries related to continuous integration infrastructure (here CI = tools + scripts + recipes)

Projects

None yet

Milestone

2.8.6

Development

Successfully merging this pull request may close these issues.

3 participants

@jimklimov @nmbro @AppVeyorBot