search

networkupstools / nut-website

Network UPS Tools website and protocol library
6 stars 14 forks source link

Rendered nut-website did not update after 2.8.2 release (or along with master actually) in its entirety, at least for man pages #47

Open jimklimov opened 7 months ago

jimklimov commented 7 months ago

e.g. https://networkupstools.org/docs/man/riello_ser.html is from almost a year ago now, and there were changes last week in NUT code for it; I saw reports that some man pages were missing altogether - e.g. in the historic site rendition: https://networkupstools.org/historic/v2.8.2/docs/man/index.html#User_man (it was there for previous historic release snapshot: https://networkupstools.org/historic/v2.8.1/docs/man/index.html#Developer_man and before that).

news page does refresh though, release notes are also at post-2.8.2 level https://networkupstools.org/docs/release-notes.chunked/index.html reflecting the master-branch changes at e.g. https://networkupstools.org/docs/release-notes.chunked/NUT_Release_Notes.html#_planned_release_notes_for_nut_2_8_3_what_8217_s_new_since_2_8_2

jimklimov commented 7 months ago

https://ci.networkupstools.org/view/InfraTasks/job/nut-website/5983/console

14:03:24  [GitCheckoutListener] Recording commits of 'git https://github.com/networkupstools/nut-website'
14:03:24  [GitCheckoutListener] Found previous build 'nut-website #5982' that contains recorded Git commits
14:03:24  [GitCheckoutListener] -> Starting recording of new commits since '168a815'
14:03:24  [GitCheckoutListener] -> Multiple parent commits found - storing latest commit of local merge '168a815'
14:03:24  [GitCheckoutListener] -> Using parent commit '9463b49' of local merge as starting point
14:03:24  [GitCheckoutListener] -> Storing target branch head 'e8152b3' (second parent of local merge) 
14:03:24  [GitCheckoutListener] -> Recorded 200 new commits
14:03:24  [GitCheckoutListener] -> The latest commit '168a81568e1f4cafcc37a3b51b2c7d9193bbfbf3' is a merge commit
14:03:24  [GitCheckoutListener] -> Git commit decorator successfully obtained 'hudson.plugins.git.browser.GithubWeb@4eec3458' to render commit links

200 new commits? hmmm... UPDATE: Now we have several workers capable of website rendering - perhaps this one did not get to work in a while.

Actually, its local workspace could have been hit by the intensive attempts to release v2.8.2 (so its own rendition of the site was not ultimately pushed, in favor of another worker's pushed success). In workspace:

commit bad93e0007bd96bcb932939af0b4de3e615d9f6c (HEAD -> master)
Author: NUT CI Farm <support@networkupstools.org>
Date:   Mon Apr 1 20:44:10 2024 +0000

    Updated submodule references as of 20240401T204409Z: nut:440ca2348 nut-ddl:fddf9e0 source:ea7ffd2 package:deb0cbf

commit 0a5e68f4fd4cea8ad70e0ad130c9b981b717fe0d
Author: NUT CI Farm <support@networkupstools.org>
Date:   Sun Mar 24 02:46:17 2024 +0000

    Updated submodule references as of 20240324T024617Z: nut:71f898833 nut-ddl:0eca0ce source:ea7ffd2 package:deb0cbf

and in the job checkout:

14:03:26  + git checkout master
14:03:26  Previous HEAD position was 168a8156 Merge pull request #46 from jimklimov/nut-website-dict
14:03:26  Switched to branch 'master'
14:03:26  M ddl
14:03:26  M nut
14:03:26  M source
14:03:26  Your branch and 'origin/master' have diverged,
14:03:26  and have 1 and 25 different commits each, respectively.
14:03:26    (use "git pull" to merge the remote branch into yours)
14:03:26  + git rebase origin/master
14:03:26  fatal: It seems that there is already a rebase-merge directory, and
14:03:26  I wonder if you are in the middle of another rebase.  If that is the
14:03:26  case, please try
14:03:26    git rebase (--continue | --abort | --skip)
14:03:26  If that is not the case, please
14:03:26    rm -fr ".git/rebase-merge"
14:03:26  and run me again.  I am stopping in case you still have something
14:03:26  valuable there.
jimklimov commented 7 months ago

A rebase indeed failed due to submodules (which ref to pick?):

$ git rebase origin/master
Fast-forwarding submodule nut
Auto-merging nut
error: add_cacheinfo failed to refresh for path 'nut'; merge aborting.
hint: Could not execute the todo command
hint:
hint:     pick bad93e0007bd96bcb932939af0b4de3e615d9f6c Updated submodule references as of 20240401T204409Z: nut:440ca2348 nut-ddl:fddf9e0 source:ea7ffd2 package:deb0cbf
hint:
hint: It has been rescheduled; To edit the command before continuing, please
hint: edit the todo list first:
hint:
hint:     git rebase --edit-todo
hint:     git rebase --continue
Could not apply bad93e000... Updated submodule references as of 20240401T204409Z: nut:440ca2348 nut-ddl:fddf9e0 source:ea7ffd2 package:deb0cbf

Guess gotta leave one worker marked as capable for iterative builds.