Merge branch '2.9' - #4371
Open
grandixximo wants to merge 9 commits into
Open
Conversation
… in progress Fixes LinuxCNC#3314 The modification to 'command.c' prevents the homing process breaking where the joint would continue moving indefinitely. The modifications to axis.py and gmoccapy.py prevents the gui freezing that occurs due to wait_complete() timing out to the default 5 seconds.
The relevant logic was changed in Commit b2cd764 but the man page was not updated. The Functionality of the logic is likely easier to understand by looking at the code.
The azure.archive.ubuntu.com apt mirror on GitHub-hosted runners regularly degrades to trickle speeds for extended periods, stalling package downloads until the job hits its timeout. This is a recurring upstream problem, see actions/runner-images issues #7048 and #12949. apt retries do not help because the connection stays alive, only slow. Switch affected jobs to archive.ubuntu.com, which is consistently fast from Azure.
The runner image configures apt with URIs: mirror+file:///etc/apt/apt-mirrors.txt in ubuntu.sources, so the azure.archive.ubuntu.com URL lives in that file, not in sources.list or the .list/.sources files. The sed pass in 1d46401 therefore matched nothing and apt kept using the azure mirror; the rip-and-test job on this branch stalled in Install dependencies and was cancelled at the 45 minute timeout. Add /etc/apt/apt-mirrors.txt to the rewrite list and fail the step if any azure.archive.ubuntu.com reference survives under /etc/apt, so a future runner image layout change cannot turn this script into a silent no-op again.
2.9 CI: Use main Ubuntu archive instead of azure.archive.ubuntu.com (backport of LinuxCNC#4336)
…rd-2.9 Fix homing bug when trying to home while homing is in progress (2.9 backport)
…-fix docs: spindle orient fix
Contributor
Author
|
@hansu does this look right? |
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 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.
Periodical merge of 2.9 into master, keeping the branches in sync as done previously (e.g. 3a05670).
This one turns out to be content-neutral: every commit currently on 2.9 that was missing from master is already represented on master in equivalent form:
Two trivial conflicts, both resolved keeping master's version:
src/hal/components/orient.comp: 2.9 edited the old roff markup; master has the same wording in adocgmoccapy.py: 2.9 uses the literal(13, ...); master useslinuxcnc.OPERATOR_DISPLAY(same value)The merged tree is byte-identical to current master (
git diff master MERGEis empty), so this is pure ancestry bookkeeping: it records that 2.9 is fully merged up, and gives the next 2.9 => master merge a clean base.