mirror of
https://github.com/logos-messaging/logos-messaging-nim.git
synced 2026-05-21 09:49:29 +00:00
c6e448a0ba
* fix(node-info): real Version + new Commit in Nix/lgpm builds
getNodeInfo Version returned "n/a" on Nix-built libs (and lgpm
releases built from the flake) because nix/default.nix never passed
-d:git_version. A flake sandbox has no .git, so git describe is
impossible; derive the semver from waku.nimble's version field plus
the flake short commit, and expose the full commit SHA via a new
Commit node info id.
- waku_state_info: add Commit to NodeInfoId + dispatch git_commit
- waku_node: add git_commit {.strdefine.} (default "n/a")
- node start logs ("Starting Waku node" / "Running nwaku node") now
print commit = git_commit alongside version
- Makefile: inject -d:git_commit (full SHA), mirrors docker label
- nix/default.nix: accept gitVersion/gitCommit, pass as nim defines
- flake.nix: gitVersion = <nimble version>-g<shortRev>, gitCommit = rev
- CI version-check (PR only): ancestor-aware `git describe --tags
--abbrev=0` vs PR HEAD, base-version compare, so waku.nimble is kept
current early and a new tag never breaks in-flight PRs
- release-assets.yml: gate build/upload on a verify-version job
asserting tag base == waku.nimble (RC tags allowed), so a mismatched
tag publishes no artifacts
- docs: prepare_release.md explains the bump-before-tag requirement
Refs: status-im/infra-logos#4
Closes: logos-messaging/logos-delivery#3884
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
* docs: simplify
* chore: update version in waku.nimble
* fix(node-info): remove Commit node info field
Drop the newly added Commit (full SHA) node info id and its
git_commit compile-time define plumbing across Makefile, flake.nix
and nix/default.nix; revert the start/run log lines to version only.
The PR now solely fixes the getNodeInfo Version regression.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
* chore(nix): align git_version format closer to Makefile
Adds the `v` prefix and uses a 6-char SHA so Nix-built nodes report
e.g. `v0.38.1-g52e980`, matching the shape of `git describe --abbrev=6
--always --tags` aside from the unreachable commit-count segment (tag
metadata isn't exposed through the flake input protocol).
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
---------
Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
50 lines
2.2 KiB
YAML
50 lines
2.2 KiB
YAML
name: version check
|
|
permissions:
|
|
contents: read
|
|
|
|
on:
|
|
pull_request:
|
|
branches: [master]
|
|
|
|
jobs:
|
|
# PR check: waku.nimble version must be >= the nearest tag reachable from
|
|
# this branch (`git describe --tags --abbrev=0`, i.e. ancestor-aware).
|
|
# Because we check out the PR HEAD (not the simulated merge ref), a branch
|
|
# that predates a release tag does not see that tag in its history, so a
|
|
# newly pushed tag does NOT break in-flight PRs. Once the branch merges/
|
|
# rebases past the tag, the bump is then enforced. This keeps waku.nimble
|
|
# fixed as early as possible, independent of whether a release is cut.
|
|
# The exact tag==nimble guarantee at release time lives in
|
|
# release-assets.yml, which gates artifact publishing on it.
|
|
nimble-not-behind-tag:
|
|
runs-on: ubuntu-22.04
|
|
steps:
|
|
- uses: actions/checkout@v4
|
|
with:
|
|
fetch-depth: 0
|
|
ref: ${{ github.event.pull_request.head.sha }}
|
|
- name: Compare waku.nimble version with nearest ancestor tag
|
|
run: |
|
|
set -euo pipefail
|
|
NIMBLE_VERSION=$(grep -m1 '^version = ' waku.nimble | sed -E 's/version = "([^"]+)"/\1/')
|
|
# Nearest tag reachable from HEAD; --abbrev=0 drops the -<n>-g<sha>
|
|
# suffix so we get the bare tag (e.g. v0.38.0).
|
|
BASE_TAG=$(git describe --tags --abbrev=0 2>/dev/null || echo "")
|
|
BASE_TAG=${BASE_TAG#v}
|
|
# Compare on the base version, ignoring any -rc.N prerelease suffix.
|
|
BASE_TAG=${BASE_TAG%%-*}
|
|
echo "waku.nimble version: ${NIMBLE_VERSION}"
|
|
echo "ancestor git tag: ${BASE_TAG:-<none>}"
|
|
if [ -z "${BASE_TAG}" ]; then
|
|
echo "No ancestor release tag; skipping."
|
|
exit 0
|
|
fi
|
|
# lowest of the two by version sort must be the tag => nimble >= tag
|
|
LOWEST=$(printf '%s\n%s\n' "${NIMBLE_VERSION}" "${BASE_TAG}" | sort -V | head -1)
|
|
if [ "${LOWEST}" != "${BASE_TAG}" ] && [ "${NIMBLE_VERSION}" != "${BASE_TAG}" ]; then
|
|
echo "::error::waku.nimble version (${NIMBLE_VERSION}) is behind its"
|
|
echo "::error::ancestor git tag (v${BASE_TAG}). Bump 'version' in waku.nimble."
|
|
exit 1
|
|
fi
|
|
echo "OK: waku.nimble is not behind its ancestor tag."
|