Skip to content

tools/ci.sh: Fix commit check base branch for 3.x#440

Merged
ederjc merged 3 commits into
master-2.x-3.xfrom
bugfix/ci-commit-check-base-3x
Jun 10, 2026
Merged

tools/ci.sh: Fix commit check base branch for 3.x#440
ederjc merged 3 commits into
master-2.x-3.xfrom
bugfix/ci-commit-check-base-3x

Conversation

@ederjc

@ederjc ederjc commented Jun 10, 2026

Copy link
Copy Markdown
Member

Problem

Two CI checks were always failing for feature branches based on master-2.x-3.x:

1. Commit message check (commit_formatting.yml)
ci_commit_formatting_run in tools/ci.sh compared against upstream/master. Since master-2.x-3.x diverged far from master, this caused verifygitlog.py to check all 700+ historical commits — many of which were merged via GitHub with noreply email addresses — making the check always fail regardless of the new commit's quality.

2. HIL unit tests (hil-unity-checks.yml)
The HIL workflow requires a self-hosted runner with physical XMC hardware boards connected. This infrastructure is not configured for the master-2.x-3.x branch, so the workflow fails on every push.

Fix

  • tools/ci.sh: Changed base reference from upstream/master to upstream/master-2.x-3.x, and added --ignore-rebase to match the master branch behaviour. Only commits added by a feature branch are now checked.
  • .github/workflows/hil-unity-checks.yml: Removed from this branch until the HIL self-hosted runner infrastructure is set up to support master-2.x-3.x.

Related

Discovered while working on #439 — missing __FlashStringHelper String implementations in WString.cpp.

ederjc added 3 commits June 10, 2026 16:51
The ci_commit_formatting_run function compared against upstream/master,
which caused verifygitlog.py to check all 700+ historical commits on
master-2.x-3.x. Many of those were merged with noreply GitHub emails,
making the check always fail for any feature branch based on
master-2.x-3.x.

Fix the base reference to upstream/master-2.x-3.x so only the commits
added by a feature branch are verified. Also add --ignore-rebase to
match the behaviour of the master branch ci.sh.

Signed-off-by: Julian Eder <julian.eder@infineon.com>
The HIL self-hosted runner infrastructure is not configured for the
master-2.x-3.x branch, causing the workflow to always fail on every
push. Remove it until the HIL setup supports this branch.

Signed-off-by: Julian Eder <julian.eder@infineon.com>
The arduino.cc/en/Guide/Introduction URL returns 404. Replace it with
the current docs.arduino.cc getting-started page. Also remove the HIL
workflow badge since hil-unity-checks.yml is no longer present on this
branch.

Signed-off-by: Julian Eder <julian.eder@infineon.com>
@ederjc ederjc marked this pull request as ready for review June 10, 2026 15:15

@LinjingZhang LinjingZhang left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍 nice

@ederjc ederjc merged commit 512f8d1 into master-2.x-3.x Jun 10, 2026
31 checks passed
@ederjc ederjc deleted the bugfix/ci-commit-check-base-3x branch June 10, 2026 16:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants