From 2a70a73245e57d1ca58ffd2ba4247d6cfb08470d Mon Sep 17 00:00:00 2001 From: Hadrien Grasland Date: Wed, 29 May 2024 20:12:25 +0200 Subject: [PATCH 1/6] Check hwlocality for semver compliance too --- .github/workflows/ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6009e5d..44bb1d9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -146,7 +146,6 @@ jobs: - name: Check semver compliance uses: obi1kenobi/cargo-semver-checks-action@v2 with: - package: hwlocality-sys # TODO: Extend once hwlocality is released feature-group: default-features features: ${{ matrix.features }} rust-toolchain: manual From 9b2cd585e64953cfcdd58418de41ef654984fd1b Mon Sep 17 00:00:00 2001 From: Hadrien Grasland Date: Wed, 29 May 2024 20:17:10 +0200 Subject: [PATCH 2/6] Is a new alpha enough to make semver check happy? --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index cf94382..56b4b4e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -36,7 +36,7 @@ overflow-checks = false [package] name = "hwlocality" -version = "1.0.0-alpha.3" +version = "1.0.0-alpha.4" authors.workspace = true edition.workspace = true rust-version.workspace = true From f26ab581ef387fa267af27ffb4c6534ec17439d7 Mon Sep 17 00:00:00 2001 From: Hadrien Grasland Date: Wed, 29 May 2024 20:18:24 +0200 Subject: [PATCH 3/6] Finish master -> main switch while I'm at it --- README.md | 8 ++++---- hwlocality-sys/README.md | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 5adb4ea..7f0ee08 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ [![MIT licensed](https://img.shields.io/badge/license-MIT-blue.svg)](./LICENSE) [![Package on crates.io](https://img.shields.io/crates/v/hwlocality.svg)](https://crates.io/crates/hwlocality) [![Documentation](https://docs.rs/hwlocality/badge.svg)](https://docs.rs/hwlocality/) -[![Continuous Integration](https://img.shields.io/github/actions/workflow/status/HadrienG2/hwlocality/ci.yml?branch=master)](https://github.com/HadrienG2/hwlocality/actions?query=workflow%3A%22Continuous+Integration%22) +[![Continuous Integration](https://img.shields.io/github/actions/workflow/status/HadrienG2/hwlocality/ci.yml?branch=main)](https://github.com/HadrienG2/hwlocality/actions?query=workflow%3A%22Continuous+Integration%22) [![Code coverage](https://codecov.io/gh/HadrienG2/hwlocality/graph/badge.svg?token=OYWLNUD9AI)](https://codecov.io/gh/HadrienG2/hwlocality) [![CII Best Practices Summary](https://img.shields.io/cii/summary/7876)](https://www.bestpractices.dev/en/projects/7876) ![Requires rustc 1.71.0+](https://img.shields.io/badge/rustc-1.71.0+-lightgray.svg) @@ -65,7 +65,7 @@ default. You can enable them, at the cost of losing compatibility with older hwloc 2.x releases, by enabling the cargo feature that matches the lowest hwloc release you need to be compatible with. See [the `[features]` section of this -crate's Cargo.toml](https://github.com/hadrieng2/hwlocality/tree/master/Cargo.toml#L15) +crate's Cargo.toml](https://github.com/hadrieng2/hwlocality/tree/main/Cargo.toml#L15) for more information. ## Usage @@ -148,7 +148,7 @@ One possible output is: ``` More examples are available [in the source -repository](https://github.com/hadrieng2/hwlocality/tree/master/examples). +repository](https://github.com/hadrieng2/hwlocality/tree/main/examples). ## hwloc API coverage @@ -175,5 +175,5 @@ ergonomics improvements permitted by the Rust type system. For example... ## License This project uses the MIT license, please see the -[LICENSE](https://github.com/hadrieng2/hwlocality/blob/master/LICENSE) file for +[LICENSE](https://github.com/hadrieng2/hwlocality/blob/main/LICENSE) file for more information. diff --git a/hwlocality-sys/README.md b/hwlocality-sys/README.md index c7337a1..21b4abb 100644 --- a/hwlocality-sys/README.md +++ b/hwlocality-sys/README.md @@ -3,7 +3,7 @@ [![MIT licensed](https://img.shields.io/badge/license-MIT-blue.svg)](./LICENSE) [![On crates.io](https://img.shields.io/crates/v/hwlocality-sys.svg)](https://crates.io/crates/hwlocality-sys) [![On docs.rs](https://docs.rs/hwlocality-sys/badge.svg)](https://docs.rs/hwlocality-sys/) -[![Continuous Integration](https://img.shields.io/github/actions/workflow/status/HadrienG2/hwlocality/ci.yml?branch=master)](https://github.com/HadrienG2/hwlocality/actions?query=workflow%3A%22Continuous+Integration%22) +[![Continuous Integration](https://img.shields.io/github/actions/workflow/status/HadrienG2/hwlocality/ci.yml?branch=main)](https://github.com/HadrienG2/hwlocality/actions?query=workflow%3A%22Continuous+Integration%22) [![CII Best Practices Summary](https://img.shields.io/cii/summary/7876)](https://www.bestpractices.dev/en/projects/7876) ![Requires rustc 1.71.0+](https://img.shields.io/badge/rustc-1.71.0+-lightgray.svg) From 794a93e007b098b5f1eaf66fa69eb5410c018dc0 Mon Sep 17 00:00:00 2001 From: Hadrien Grasland Date: Wed, 29 May 2024 20:30:28 +0200 Subject: [PATCH 4/6] Stop using path dependencies to avoid blocking cargo publish --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 56b4b4e..b987c90 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -197,7 +197,7 @@ enum-iterator = "2.0" errno = "0.3" # Part of this project (raw FFI binding) -hwlocality-sys = { path = "./hwlocality-sys" } +hwlocality-sys = "0.4.1" # Used for malloc, free, OS typedefs, and example thread queries libc.workspace = true From 4f4057ba2364b2202761fd736c261aa6a3ed8336 Mon Sep 17 00:00:00 2001 From: Hadrien Grasland Date: Wed, 29 May 2024 20:31:18 +0200 Subject: [PATCH 5/6] Tag a new hwlocality-sys release --- hwlocality-sys/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hwlocality-sys/Cargo.toml b/hwlocality-sys/Cargo.toml index 6264e39..4fbdd09 100644 --- a/hwlocality-sys/Cargo.toml +++ b/hwlocality-sys/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "hwlocality-sys" -version = "0.4.1" +version = "0.4.2" authors.workspace = true edition.workspace = true rust-version.workspace = true From b145e6589fcc0df92dd4ff28e43b0b4061caa577 Mon Sep 17 00:00:00 2001 From: Hadrien Grasland Date: Wed, 29 May 2024 20:59:41 +0200 Subject: [PATCH 6/6] Maybe path dependencies are better after all --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index b987c90..56b4b4e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -197,7 +197,7 @@ enum-iterator = "2.0" errno = "0.3" # Part of this project (raw FFI binding) -hwlocality-sys = "0.4.1" +hwlocality-sys = { path = "./hwlocality-sys" } # Used for malloc, free, OS typedefs, and example thread queries libc.workspace = true