mirror of
https://github.com/logos-messaging/logos-messaging-nim.git
synced 2026-05-21 09:49:29 +00:00
* 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>
99 lines
3.0 KiB
Nix
99 lines
3.0 KiB
Nix
{
|
|
description = "logos-delivery nim build flake";
|
|
|
|
nixConfig = {
|
|
extra-substituters = [ "https://nix-cache.status.im/" ];
|
|
extra-trusted-public-keys = [
|
|
"nix-cache.status.im-1:x/93lOfLU+duPplwMSBR+OlY4+mo+dCN7n0mr4oPwgY="
|
|
];
|
|
};
|
|
|
|
inputs = {
|
|
# Pinning the commit to use same commit across different projects.
|
|
# A commit from nixpkgs 25.11 release: https://github.com/NixOS/nixpkgs/tree/release-25.11
|
|
nixpkgs.url = "github:NixOS/nixpkgs?rev=23d72dabcb3b12469f57b37170fcbc1789bd7457";
|
|
|
|
rust-overlay = {
|
|
url = "github:oxalica/rust-overlay";
|
|
inputs.nixpkgs.follows = "nixpkgs";
|
|
};
|
|
|
|
# External flake input: Zerokit pinned to a specific commit.
|
|
# Update the rev here when a new zerokit version is needed.
|
|
zerokit = {
|
|
url = "github:vacp2p/zerokit/53b18098e6d5d046e3eb1ac338a8f4f651432477";
|
|
inputs.nixpkgs.follows = "nixpkgs";
|
|
};
|
|
};
|
|
|
|
outputs = { self, nixpkgs, rust-overlay, zerokit }:
|
|
let
|
|
systems = [
|
|
"x86_64-linux" "aarch64-linux"
|
|
"x86_64-darwin" "aarch64-darwin"
|
|
"x86_64-windows"
|
|
];
|
|
|
|
forAllSystems = nixpkgs.lib.genAttrs systems;
|
|
|
|
lib = nixpkgs.lib;
|
|
|
|
# Single source of truth for the semver: the `version` field of
|
|
# waku.nimble. Kept in sync with git tags by the version-check CI.
|
|
nimbleVersion =
|
|
let line = lib.findFirst (l: lib.hasPrefix "version = " l)
|
|
"version = \"unknown\""
|
|
(lib.splitString "\n" (builtins.readFile ./waku.nimble));
|
|
in lib.removeSuffix "\"" (lib.removePrefix "version = \"" line);
|
|
|
|
# A flake sandbox has no .git, so `git describe` is impossible; the
|
|
# commit comes from the flake metadata instead.
|
|
shortRev = self.shortRev or self.dirtyShortRev or "dirty";
|
|
|
|
nimbleOverlay = final: prev: {
|
|
nimble = prev.nimble.overrideAttrs (_: {
|
|
version = "0.22.3";
|
|
src = prev.fetchFromGitHub {
|
|
owner = "nim-lang";
|
|
repo = "nimble";
|
|
rev = "v0.22.3";
|
|
sha256 = "sha256-f7DYpRGVUeSi6basK1lfu5AxZpMFOSJ3oYsy+urYErg=";
|
|
};
|
|
});
|
|
};
|
|
|
|
pkgsFor = system: import nixpkgs {
|
|
inherit system;
|
|
overlays = [ (import rust-overlay) nimbleOverlay ];
|
|
};
|
|
in {
|
|
packages = forAllSystems (system:
|
|
let
|
|
pkgs = pkgsFor system;
|
|
liblogosdelivery = pkgs.callPackage ./nix/default.nix {
|
|
inherit pkgs;
|
|
src = ./.;
|
|
zerokitRln = zerokit.packages.${system}.rln;
|
|
gitVersion = "v${nimbleVersion}-g${builtins.substring 0 6 shortRev}";
|
|
};
|
|
in {
|
|
inherit liblogosdelivery;
|
|
default = liblogosdelivery;
|
|
}
|
|
);
|
|
|
|
devShells = forAllSystems (system:
|
|
let
|
|
pkgs = pkgsFor system;
|
|
in {
|
|
default = pkgs.mkShell {
|
|
nativeBuildInputs = with pkgs; [
|
|
nim-2_2
|
|
nimble
|
|
];
|
|
};
|
|
}
|
|
);
|
|
};
|
|
}
|