rad:z3gqcJUoA1n9HaHKufZs5FCSGazv5 heartwood5962571c9b277ef8f3358284bc55c9fe8b28ee08
{
"request": "trigger",
"version": 1,
"event_type": "patch",
"repository": {
"id": "rad:z3gqcJUoA1n9HaHKufZs5FCSGazv5",
"name": "heartwood",
"description": "Radicle Heartwood Protocol & Stack",
"private": false,
"default_branch": "master",
"delegates": [
"did:key:z6MksFqXN3Yhqk8pTJdUGLwATkRfQvwZXPqR2qMEhbS9wzpT",
"did:key:z6MkireRatUThvd3qzfKht1S44wpm4FEWSSa4PRMTSQZ3voM",
"did:key:z6MkkPvBfjP4bQmco5Dm7UGsX2ruDBieEHi8n9DVJWX5sTEz"
]
},
"action": "Created",
"patch": {
"id": "cff338b7db059bb9aabf9ab08334157eb31886be",
"author": {
"id": "did:key:z6MkkPvBfjP4bQmco5Dm7UGsX2ruDBieEHi8n9DVJWX5sTEz",
"alias": null
},
"title": "nix, rust: Update",
"state": {
"status": "merged",
"conflicts": []
},
"before": "16560950ecfab3c8b9edf19db4cb4d665e8472ea",
"after": "5962571c9b277ef8f3358284bc55c9fe8b28ee08",
"commits": [
"5962571c9b277ef8f3358284bc55c9fe8b28ee08",
"fb04774c7d5b04d29c0075b902d97e5e36aa9086",
"1da355bbad9a6655d0abbe2517e8123d447577af"
],
"target": "7e1cb406bb935c3de008d2171e8961f57b4336ea",
"labels": [],
"assignees": [],
"revisions": [
{
"id": "cff338b7db059bb9aabf9ab08334157eb31886be",
"author": {
"id": "did:key:z6MkkPvBfjP4bQmco5Dm7UGsX2ruDBieEHi8n9DVJWX5sTEz",
"alias": null
},
"description": "- Update the flake's dependencies so that Rust 1.80 is available.\n - Migrate from `rust-toolchain` to `rust-toolchain.toml`, allowing us to specify components such as `rust-src` to be installed.\n - Set `RUST_SRC_DIR` in Nix development shell, which is used by Rust tooling.",
"base": "16560950ecfab3c8b9edf19db4cb4d665e8472ea",
"oid": "5962571c9b277ef8f3358284bc55c9fe8b28ee08",
"timestamp": 1722956911
},
{
"id": "b200b05cb6d1762c1adfee0ed04962734d36e5a6",
"author": {
"id": "did:key:z6MkkPvBfjP4bQmco5Dm7UGsX2ruDBieEHi8n9DVJWX5sTEz",
"alias": null
},
"description": "Rebased on latest `master`",
"base": "757483f35139d6642ffeed657ba0f88fae512674",
"oid": "0dd06b91c1ac610a94f9068651f1a133d1b13bac",
"timestamp": 1724321998
},
{
"id": "a6b72c3c5bc5ce58f2cce9ee93e8f3bd3f536077",
"author": {
"id": "did:key:z6MkkPvBfjP4bQmco5Dm7UGsX2ruDBieEHi8n9DVJWX5sTEz",
"alias": null
},
"description": "Rebase.",
"base": "757483f35139d6642ffeed657ba0f88fae512674",
"oid": "19c7e67265b2a9d8c9091e092c5c4969e766b4fc",
"timestamp": 1724333940
}
]
}
}
{
"response": "triggered",
"run_id": {
"id": "1ae47f4d-b0ef-476e-919c-25064734a90f"
},
"info_url": "https://cci.rad.levitte.org//1ae47f4d-b0ef-476e-919c-25064734a90f.html"
}
Started at: 2026-09-08 19:12:16.862692+02:00
Commands:
$ rad clone rad:z3gqcJUoA1n9HaHKufZs5FCSGazv5 .
✓ Creating checkout in ./...
✓ Remote cloudhead@z6MksFqXN3Yhqk8pTJdUGLwATkRfQvwZXPqR2qMEhbS9wzpT added
✓ Remote-tracking branch cloudhead@z6MksFqXN3Yhqk8pTJdUGLwATkRfQvwZXPqR2qMEhbS9wzpT/master created for z6MksFqXN3Yhqk8pTJdUGLwATkRfQvwZXPqR2qMEhbS9wzpT
✓ Remote fintohaps@z6MkireRatUThvd3qzfKht1S44wpm4FEWSSa4PRMTSQZ3voM added
✓ Remote-tracking branch fintohaps@z6MkireRatUThvd3qzfKht1S44wpm4FEWSSa4PRMTSQZ3voM/master created for z6MkireRatUThvd3qzfKht1S44wpm4FEWSSa4PRMTSQZ3voM
✓ Remote lorenz@z6MkkPvBfjP4bQmco5Dm7UGsX2ruDBieEHi8n9DVJWX5sTEz added
✓ Remote-tracking branch lorenz@z6MkkPvBfjP4bQmco5Dm7UGsX2ruDBieEHi8n9DVJWX5sTEz/master created for z6MkkPvBfjP4bQmco5Dm7UGsX2ruDBieEHi8n9DVJWX5sTEz
✓ Repository successfully cloned under /opt/radcis/ci.rad.levitte.org/cci/state/1ae47f4d-b0ef-476e-919c-25064734a90f/w/
╭────────────────────────────────────╮
│ heartwood │
│ Radicle Heartwood Protocol & Stack │
│ 189 issues · 39 patches │
╰────────────────────────────────────╯
Run `cd ./.` to go to the repository directory.
Exit code: 0
$ rad patch checkout cff338b7db059bb9aabf9ab08334157eb31886be
✓ Switched to branch patch/cff338b at revision cff338b
✓ Branch patch/cff338b setup to track rad/patches/cff338b7db059bb9aabf9ab08334157eb31886be
Exit code: 0
$ git config advice.detachedHead false
Exit code: 0
$ git checkout 5962571c9b277ef8f3358284bc55c9fe8b28ee08
HEAD is now at 5962571c nix: Correctly set `RUST_SRC_DIR`
Exit code: 0
$ rad patch show cff338b7db059bb9aabf9ab08334157eb31886be -p
╭──────────────────────────────────────────────────────────────────────────────────╮
│ Title nix, rust: Update │
│ Patch cff338b7db059bb9aabf9ab08334157eb31886be │
│ Author lorenz z6MkkPv…WX5sTEz │
│ Head 5962571c9b277ef8f3358284bc55c9fe8b28ee08 │
│ Base 16560950ecfab3c8b9edf19db4cb4d665e8472ea │
│ Target master │
│ Branches patch/cff338b │
│ Commits ahead 3, behind 1230 │
│ Status merged │
│ │
│ - Update the flake's dependencies so that Rust 1.80 is available. │
│ - Migrate from `rust-toolchain` to `rust-toolchain.toml`, allowing us to speci… │
│ - Set `RUST_SRC_DIR` in Nix development shell, which is used by Rust tooling. │
├──────────────────────────────────────────────────────────────────────────────────┤
│ 5962571 nix: Correctly set `RUST_SRC_DIR` │
│ fb04774 rust: Migrate to `rust-toolchain.toml` │
│ 1da355b nix: Update flake to get to reach Rust 1.80 │
├──────────────────────────────────────────────────────────────────────────────────┤
│ ● Revision cff338b @ 1656095..5962571 by lorenz z6MkkPv…WX5sTEz 2 years ago │
│ ↑ Revision b200b05 @ 757483f..0dd06b9 by fintohaps z6Mkire…SQZ3voM 2 years ago │
│ └─ ✓ merged by cloudhead z6MksFq…bS9wzpT │
│ ↑ Revision a6b72c3 @ 757483f..19c7e67 by cloudhead z6MksFq…bS9wzpT 2 years ago │
╰──────────────────────────────────────────────────────────────────────────────────╯
commit 5962571c9b277ef8f3358284bc55c9fe8b28ee08
Author: Lorenz Leutgeb <lorenz@leutgeb.xyz>
Date: Tue Aug 6 16:43:44 2024 +0200
nix: Correctly set `RUST_SRC_DIR`
diff --git a/flake.nix b/flake.nix
index d8004fb426..2db08da359 100644
--- a/flake.nix
+++ b/flake.nix
@@ -45,7 +45,7 @@
overlays = [(import rust-overlay)];
};
- rustToolChain = pkgs.rust-bin.fromRustupToolchainFile ./rust-toolchain;
+ rustToolChain = pkgs.rust-bin.fromRustupToolchainFile ./rust-toolchain.toml;
craneLib = (crane.mkLib pkgs).overrideToolchain rustToolChain;
srcFilters = path: type:
@@ -238,6 +238,8 @@
rust-analyzer
sqlite
];
+
+ env.RUST_SRC_PATH = "${rustToolChain}/lib/rustlib/src/rust/library";
};
});
}
commit fb04774c7d5b04d29c0075b902d97e5e36aa9086
Author: Lorenz Leutgeb <lorenz@leutgeb.xyz>
Date: Tue Aug 6 16:49:46 2024 +0200
rust: Migrate to `rust-toolchain.toml`
See
- https://rust-lang.github.io/rustup/overrides.html#the-toolchain-file
diff --git a/rust-toolchain b/rust-toolchain
deleted file mode 100644
index d456f74597..0000000000
--- a/rust-toolchain
+++ /dev/null
@@ -1 +0,0 @@
-1.80
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
new file mode 100644
index 0000000000..96b30271d8
--- /dev/null
+++ b/rust-toolchain.toml
@@ -0,0 +1,4 @@
+[toolchain]
+channel = "1.80"
+profile = "default"
+components = [ "rust-src" ]
commit 1da355bbad9a6655d0abbe2517e8123d447577af
Author: Lorenz Leutgeb <lorenz@leutgeb.xyz>
Date: Tue Aug 6 16:59:46 2024 +0200
nix: Update flake to get to reach Rust 1.80
diff --git a/flake.lock b/flake.lock
index 179639b721..416d4fcdc8 100644
--- a/flake.lock
+++ b/flake.lock
@@ -3,11 +3,11 @@
"advisory-db": {
"flake": false,
"locked": {
- "lastModified": 1714183630,
- "narHash": "sha256-1BVft7ggSN2XXFeXQjazU3jN9wVECd9qp2mZx/8GDMk=",
+ "lastModified": 1722017365,
+ "narHash": "sha256-9wYR5NZIgI+qzMDlJrUzevR31fvFQRgfjlYp50Xp3Ts=",
"owner": "rustsec",
"repo": "advisory-db",
- "rev": "35e7459a331d3e0c585e56dabd03006b9b354088",
+ "rev": "9d024c07ee8c18609b43436bc865abf46636e250",
"type": "github"
},
"original": {
@@ -23,11 +23,11 @@
]
},
"locked": {
- "lastModified": 1715274763,
- "narHash": "sha256-3Iv1PGHJn9sV3HO4FlOVaaztOxa9uGLfOmUWrH7v7+A=",
+ "lastModified": 1722907532,
+ "narHash": "sha256-i/j/dMZPR7uJoQPFTa6UCahLu8kMtozYuR83lIKMERM=",
"owner": "ipetkov",
"repo": "crane",
- "rev": "27025ab71bdca30e7ed0a16c88fd74c5970fc7f5",
+ "rev": "d0c8f4ed8571c533b31c1d68e4ebc534b790cc5c",
"type": "github"
},
"original": {
@@ -56,16 +56,16 @@
},
"nixpkgs": {
"locked": {
- "lastModified": 1715336739,
- "narHash": "sha256-JpcAHWgeVo6z3uUg+xzaeZSLn7MlcZMo9y6QQ7+Ue6A=",
+ "lastModified": 1722940684,
+ "narHash": "sha256-X8JnSq0ruRWsU4PdYuxV+8W4W66F1lnCcxIZZMWzo4E=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "baefb35c627d6bc698fd376774506f5f616bc1f3",
+ "rev": "a3103d68517c6ad262ea27c96fc4a38ad81be7a0",
"type": "github"
},
"original": {
"owner": "NixOS",
- "ref": "release-23.11",
+ "ref": "release-24.05",
"repo": "nixpkgs",
"type": "github"
}
@@ -81,19 +81,16 @@
},
"rust-overlay": {
"inputs": {
- "flake-utils": [
- "flake-utils"
- ],
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
- "lastModified": 1715307487,
- "narHash": "sha256-yuDAys3JuJmhQUQGMMsl3BDQNZUYZDw0eA71OVh9FeY=",
+ "lastModified": 1722910815,
+ "narHash": "sha256-v6Vk/xlABhw2QzOa6xh3Jx/IvmlbKbOazFM+bDFQlWU=",
"owner": "oxalica",
"repo": "rust-overlay",
- "rev": "ec7a7caf50877bc32988c82653d6b3e6952a8c3f",
+ "rev": "7df2ac544c203d21b63aac23bfaec7f9b919a733",
"type": "github"
},
"original": {
diff --git a/flake.nix b/flake.nix
index 3c3d15bdd5..d8004fb426 100644
--- a/flake.nix
+++ b/flake.nix
@@ -2,7 +2,7 @@
description = "Radicle";
inputs = {
- nixpkgs.url = "github:NixOS/nixpkgs/release-23.11";
+ nixpkgs.url = "github:NixOS/nixpkgs/release-24.05";
crane = {
url = "github:ipetkov/crane";
Exit code: 0
shell: 'cargo --version rustc --version cargo fmt --check cargo clippy --all-targets --workspace -- --deny clippy::all cargo build --all-targets --workspace cargo doc --workspace cargo test --workspace --no-fail-fast '
Commands:
$ podman run --name 1ae47f4d-b0ef-476e-919c-25064734a90f -v /opt/radcis/ci.rad.levitte.org/cci/state/1ae47f4d-b0ef-476e-919c-25064734a90f/s:/1ae47f4d-b0ef-476e-919c-25064734a90f/s:ro -v /opt/radcis/ci.rad.levitte.org/cci/state/1ae47f4d-b0ef-476e-919c-25064734a90f/w:/1ae47f4d-b0ef-476e-919c-25064734a90f/w -w /1ae47f4d-b0ef-476e-919c-25064734a90f/w -v /opt/radcis/ci.rad.levitte.org/.radicle:/${id}/.radicle:ro -e RAD_HOME=/${id}/.radicle rust:trixie bash /1ae47f4d-b0ef-476e-919c-25064734a90f/s/script.sh
+ cargo --version
info: syncing channel updates for '1.80-x86_64-unknown-linux-gnu'
info: latest update on 2024-08-08, rust version 1.80.1 (3f5fd8dd4 2024-08-06)
info: downloading component 'cargo'
info: downloading component 'clippy'
info: downloading component 'rust-docs'
info: downloading component 'rust-src'
info: downloading component 'rust-std'
info: downloading component 'rustc'
info: downloading component 'rustfmt'
info: installing component 'cargo'
info: installing component 'clippy'
info: installing component 'rust-docs'
info: installing component 'rust-src'
info: installing component 'rust-std'
info: installing component 'rustc'
info: installing component 'rustfmt'
cargo 1.80.1 (376290515 2024-07-16)
+ rustc --version
rustc 1.80.1 (3f5fd8dd4 2024-08-06)
+ cargo fmt --check
Diff in /1ae47f4d-b0ef-476e-919c-25064734a90f/w/radicle-crdt/src/clock.rs at line 146:
impl Bounded for Physical {
fn min_value() -> Self {
- Self {
- seconds: u64::MIN,
- }
+ Self { seconds: u64::MIN }
}
fn max_value() -> Self {
Diff in /1ae47f4d-b0ef-476e-919c-25064734a90f/w/radicle-crdt/src/clock.rs at line 155:
- Self {
- seconds: u64::MAX,
- }
+ Self { seconds: u64::MAX }
}
}
Exit code: 1
{
"response": "finished",
"result": "failure"
}