cjdns: fix version reporting, riscv64 build and CI runtime tests - #1190
Open
BKPepe wants to merge 4 commits into
Open
cjdns: fix version reporting, riscv64 build and CI runtime tests#1190BKPepe wants to merge 4 commits into
BKPepe wants to merge 4 commits into
Conversation
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>
Member
Author
|
[allow cherry-pick] |
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
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.
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_VERSIONwas set toPKG_SOURCE_VERSION, which is never defined for tarball builds, socjdroute --versionreportedCjdns version: unknownand the generic version check failed. PassPKG_VERSIONinstead.Error: build with no premade plan, TODO: generate one), breaking every riscv64 CI job. Disable the package there until upstream gains support.test-version.sh: verify the version viacjdroute --versionfor cjdns and skip the check for cjdns-tests, whose test binary provides no version information.Maintainer: @wfleurant