Skip to content

cjdns: fix version reporting, riscv64 build and CI runtime tests - #1190

Open
BKPepe wants to merge 4 commits into
openwrt:openwrt-25.12from
BKPepe:cjdns-ci-fixes
Open

cjdns: fix version reporting, riscv64 build and CI runtime tests#1190
BKPepe wants to merge 4 commits into
openwrt:openwrt-25.12from
BKPepe:cjdns-ci-fixes

Conversation

@BKPepe

@BKPepe BKPepe commented Aug 6, 2026

Copy link
Copy Markdown
Member

This fixes the failing CI runtime tests for cjdns, which is part of the fallback test set (bird2 cjdns olsrd) used for every PR that does not change any package, so these failures currently make CI red repo-wide.

  • CJDNS_RELEASE_VERSION was set to PKG_SOURCE_VERSION, which is never defined for tarball builds, so cjdroute --version reported Cjdns version: unknown and the generic version check failed. Pass PKG_VERSION instead.
  • The bundled cnacl build system has no premade build plan for riscv64 and aborts (Error: build with no premade plan, TODO: generate one), breaking every riscv64 CI job. Disable the package there until upstream gains support.
  • Add test-version.sh: verify the version via cjdroute --version for cjdns and skip the check for cjdns-tests, whose test binary provides no version information.

Maintainer: @wfleurant

Copilot AI lite review requested due to automatic review settings August 6, 2026 07:54
@openwrt openwrt Bot added the not following guidelines Pull request does not follow formatting guidelines label Aug 6, 2026

Copilot AI left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Copilot was unable to review this pull request because the user who requested the review has reached their quota limit.

@openwrt openwrt Bot removed the not following guidelines Pull request does not follow formatting guidelines label Aug 6, 2026
@BKPepe
BKPepe requested a review from wfleurant August 10, 2026 07:48
BKPepe and others added 4 commits August 11, 2026 13:06
The package definition blocks were indented with tabs, while the
OpenWrt convention for package metadata is an indent of exactly two
spaces. Reindent the Package/cjdns and Package/cjdns-tests blocks.

No functional change.

Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>
Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
The build system consumes the CJDNS_RELEASE_VERSION environment
variable and compiles it into the binaries as CJD_PACKAGE_VERSION.
The Makefile passed PKG_SOURCE_VERSION, which is never defined for
this package as it is built from a release tarball, so cjdroute
reported "Cjdns version: unknown".

Pass PKG_VERSION instead, so `cjdroute --version` reports the
packaged release version. This also makes the version check of the
CI runtime tests pass.

Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>
Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
The bundled cnacl build system has no premade build plan for riscv64
and aborts with "build with no premade plan, TODO: generate one",
which makes every CI run for this architecture fail:

    Error: build with no premade plan, TODO: generate one
        at getPlan (.../cnacl/node_build/make.js:77:11)

Disable the package for riscv64 until upstream gains support for
this architecture.

Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>
Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
The generic version check of the CI runtime tests requires at least
one executable of a package to report PKG_VERSION. The helper tools
cjdrouteconf and publictoip6 do not provide version information and
the test binary shipped in cjdns-tests does not either, so the check
failed for both packages:

    cjdns-tests: No executables in the package provided version 21.1

Override the generic version check. cjdroute cannot be executed in
the test container on all targets: on the emulated i386 and arm
targets it crashes with SIGSEGV before printing anything, which
predates this commit and also affected the generic check. Verify the
version compiled into the binary instead, which is exactly what
`cjdroute --version` would report, and skip the check for
cjdns-tests.

Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>
Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
@openwrt openwrt Bot added the not following guidelines Pull request does not follow formatting guidelines label Aug 11, 2026
@BKPepe
BKPepe changed the base branch from master to openwrt-25.12 August 11, 2026 11:13
@openwrt openwrt Bot added the release/25.12 Pull request targets the stable release branch release/25.12 label Aug 11, 2026
@BKPepe

BKPepe commented Aug 11, 2026

Copy link
Copy Markdown
Member Author

[allow cherry-pick]

@openwrt openwrt Bot removed the not following guidelines Pull request does not follow formatting guidelines label Aug 11, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

release/25.12 Pull request targets the stable release branch release/25.12

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants