From 36e63aaefa313127223889603329542cf3cf0256 Mon Sep 17 00:00:00 2001 From: Daniel Voogsgerd Date: Mon, 28 Oct 2024 21:08:22 +0100 Subject: [PATCH 1/4] chore: Remove meta package This was needed by the zig build, but we have decided to use native compilation instead. Dropping this prevents errors where one only performs an action on the meta package instead of the workspace when --workspace is omitted. --- Cargo.lock | 4 ---- Cargo.toml | 11 ----------- src/main.rs | 17 ----------------- 3 files changed, 32 deletions(-) delete mode 100644 src/main.rs diff --git a/Cargo.lock b/Cargo.lock index f3aa11be..a654e155 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -877,10 +877,6 @@ dependencies = [ "yaml-rust2", ] -[[package]] -name = "brane-meta" -version = "3.0.0" - [[package]] name = "brane-plr" version = "3.0.0" diff --git a/Cargo.toml b/Cargo.toml index e5dd095a..5f0e263c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -71,14 +71,3 @@ error-trace = { git = "https://github.com/Lut99/error-trace-rs", tag = "v3.0.0" transform = { git = "https://github.com/Lut99/transform-rs", tag = "v0.2.0" } names = { git = "https://github.com/Lut99/names-rs", tag = "v0.1.0", default-features = false, features = [ "rand", "three-lowercase" ]} download = { git = "https://github.com/Lut99/download-rs", tag = "v0.1.0", default-features = false, features = ["download"] } - -[package] -name = "brane-meta" -edition = "2021" -rust-version = "1.74" -version.workspace = true -repository.workspace = true -license.workspace = true - -[lints.clippy] -result_large_err = { level = "allow", priority = 1 } diff --git a/src/main.rs b/src/main.rs deleted file mode 100644 index 13186148..00000000 --- a/src/main.rs +++ /dev/null @@ -1,17 +0,0 @@ -// MAIN.rs -// by Lut99 -// -// Created: -// 22 Oct 2023, 21:45:41 -// Last edited: -// 22 Oct 2023, 21:45:54 -// Auto updated? -// Yes -// -// Description: -//! Dummy binary such that we can run zigbuild -// - - -/***** ENTRYPOINT *****/ -fn main() {} From c2a021b923559d39b7ef7e39d056293eec44c2eb Mon Sep 17 00:00:00 2001 From: Daniel Voogsgerd Date: Mon, 4 Nov 2024 13:49:20 +0100 Subject: [PATCH 2/4] fix(ci): Add missing Unicode license to allowlist --- deny.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/deny.toml b/deny.toml index b6a17c6b..f85db2e0 100644 --- a/deny.toml +++ b/deny.toml @@ -23,6 +23,7 @@ allow = [ "CC0-1.0", "CC-PDDC", "OpenSSL", + "Unicode-3.0", "Unicode-DFS-2016", "Zlib", ] From c5fade7a742088328e00daf64856017420b2f53a Mon Sep 17 00:00:00 2001 From: Daniel Voogsgerd Date: Mon, 4 Nov 2024 14:09:14 +0100 Subject: [PATCH 3/4] fix(ci): Rewrite MSRV check Using --manifest path requires a main package for some (incorrect) reason. Just working around it for now by using pushd to change working directory --- ci-cd/msrv | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/ci-cd/msrv b/ci-cd/msrv index e08e4218..1d7042a9 100755 --- a/ci-cd/msrv +++ b/ci-cd/msrv @@ -4,11 +4,13 @@ shopt -s globstar ret=0 echo "Running Cargo MSRV on the entire workspace" -for file in $(tomlq -r < Cargo.toml .workspace.members.[]); do - echo "::group::${file}" - if ! cargo msrv verify --output-format json --manifest-path "$file"; then +for dir in $(tomlq -r < Cargo.toml .workspace.members.[]); do + echo "::group::${dir}" + pushd $dir + if ! cargo msrv verify --output-format json; then ret=1 fi + popd echo "::endgroup::" done From f3efdf79c32c7bb2c5367a6c66d19cf3b9b19f14 Mon Sep 17 00:00:00 2001 From: Daniel Voogsgerd Date: Thu, 14 Nov 2024 12:20:01 +0100 Subject: [PATCH 4/4] fix(ast): bump MSRV This is needed because the Cargo.toml in ctl --- brane-ast/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/brane-ast/Cargo.toml b/brane-ast/Cargo.toml index bf8a2b07..37c0b664 100644 --- a/brane-ast/Cargo.toml +++ b/brane-ast/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "brane-ast" -rust-version = "1.67.1" +rust-version = "1.73.0" edition = "2021" authors = [ "Tim Müller" ] version.workspace = true