Skip to content

Commit

Permalink
Prepare 0.0.19 Release with CI Packaging fix (#129)
Browse files Browse the repository at this point in the history
Prepare for 0.0.19 release

#120 added CI packaging. Unfortunately, ```cargo package``` in 1.84
stable toolchain doesn't handle unpublished packages in the same
workspace (but cargo publish does)

This results in CI failures when bumping version (see #128).

The solution is to use nightly feature ```-Z package-workspace```, which
takes unpublished local versions into account.
A call for testing
(```https://github.com/rust-lang/cargo/issues/10948#issuecomment-2540365225```)
went out for 1.85.0-nightly (2024-12-01) and newer.

So install nightly as well and do that. Will need to be tweaked in a few
months when that setting hopefully stabilizes.

Also, replace action-rs/toolchain with dtolnay/rust-toolchain, since
action-rs/toolchain is no longer maintained.
  • Loading branch information
cgettys-microsoft authored Jan 14, 2025
1 parent 7be0df0 commit c046cd2
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 13 deletions.
10 changes: 6 additions & 4 deletions .github/workflows/generate.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,7 @@ jobs:
uses: lukka/[email protected]

- name: Install rust stable
uses: actions-rs/toolchain@v1
with:
toolchain: stable
uses: dtolnay/rust-toolchain@stable

- name: cmake configure
run: >
Expand All @@ -39,5 +37,9 @@ jobs:
- name: build rust code
run: cmake --build build --config ${{ matrix.BUILD_TYPE }}

- name: Install rust nightly
uses: dtolnay/rust-toolchain@nightly

- name: check crate packaging
run: cargo package -p mssf-pal -p mssf-com -p mssf-core --allow-dirty
# TODO: move back to stable once package-workspace is stabilized
run: cargo +nightly -Z package-workspace package -p mssf-pal -p mssf-com -p mssf-core --allow-dirty
6 changes: 3 additions & 3 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions crates/libs/com/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "mssf-com"
version = "0.0.18"
version = "0.0.19"
edition = "2021"
license = "MIT"
description = "Rust for Azure Service Fabric. The COM base layer."
Expand All @@ -21,7 +21,7 @@ targets = []

[dependencies.mssf-pal]
path = "../pal"
version = "0.0.18"
version = "0.0.19"

[features]
default = []
Expand Down
6 changes: 3 additions & 3 deletions crates/libs/core/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "mssf-core"
version = "0.0.18"
version = "0.0.19"
edition = "2021"
license = "MIT"
description = "Rust for Azure Service Fabric. Rust safe APIs."
Expand Down Expand Up @@ -49,10 +49,10 @@ features = [
[dependencies.windows-core]
package = "mssf-pal"
path = "../pal"
version = "0.0.18"
version = "0.0.19"

[dependencies.mssf-com]
path = "../com"
version = "0.0.18"
version = "0.0.19"
default-features = false
features = ["ServiceFabric_FabricClient", "ServiceFabric_FabricCommon", "ServiceFabric_FabricTypes", "ServiceFabric_FabricRuntime"]
2 changes: 1 addition & 1 deletion crates/libs/pal/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "mssf-pal"
version = "0.0.18"
version = "0.0.19"
edition = "2021"
license = "MIT"
description = "mssf-pal enables service fabric rust to run on linux"
Expand Down

0 comments on commit c046cd2

Please sign in to comment.