diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 91208ed..6ef9bab 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -26,6 +26,8 @@ make test-integration `Cargo.lock` is committed and CI runs `cargo check --locked`, so commit lockfile changes alongside any dependency change. The release PR bumps the workspace members' entries in `Cargo.lock` itself (see `release-please-config.json`), so a release never leaves the lockfile stale. +When adding a workspace crate, give its `[workspace.dependencies]` entry a `version` pin (cargo requires one to publish a path dependency) and end the line with `# x-release-please-version`, as the existing entries do. That comment is what the release PR keys on; without it the new crate's pin is left behind at the old version. + ## Release Process ### Publishable Crates diff --git a/Cargo.toml b/Cargo.toml index 590dd99..fd98493 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -24,7 +24,7 @@ default-members = [ resolver = "2" [workspace.package] -version = "0.7.2" +version = "0.7.2" # x-release-please-version edition = "2021" license = "MIT" @@ -105,10 +105,10 @@ console_error_panic_hook = "0.1.7" lambda_http = "0.13" # Internal crates -multistore = { path = "crates/core", version = "0.7.2" } -multistore-static-config = { path = "crates/static-config", version = "0.7.2" } -multistore-sts = { path = "crates/sts", version = "0.7.2" } -multistore-metering = { path = "crates/metering", version = "0.7.2" } -multistore-cf-workers = { path = "crates/cf-workers", version = "0.7.2" } -multistore-oidc-provider = { path = "crates/oidc-provider", version = "0.7.2" } -multistore-path-mapping = { path = "crates/path-mapping", version = "0.7.2" } +multistore = { path = "crates/core", version = "0.7.2" } # x-release-please-version +multistore-static-config = { path = "crates/static-config", version = "0.7.2" } # x-release-please-version +multistore-sts = { path = "crates/sts", version = "0.7.2" } # x-release-please-version +multistore-metering = { path = "crates/metering", version = "0.7.2" } # x-release-please-version +multistore-cf-workers = { path = "crates/cf-workers", version = "0.7.2" } # x-release-please-version +multistore-oidc-provider = { path = "crates/oidc-provider", version = "0.7.2" } # x-release-please-version +multistore-path-mapping = { path = "crates/path-mapping", version = "0.7.2" } # x-release-please-version diff --git a/release-please-config.json b/release-please-config.json index bf0c09b..9fdc3f6 100644 --- a/release-please-config.json +++ b/release-please-config.json @@ -6,44 +6,8 @@ "include-component-in-tag": false, "extra-files": [ { - "type": "toml", - "path": "Cargo.toml", - "jsonpath": "$.workspace.package.version" - }, - { - "type": "toml", - "path": "Cargo.toml", - "jsonpath": "$.workspace.dependencies.multistore.version" - }, - { - "type": "toml", - "path": "Cargo.toml", - "jsonpath": "$.workspace.dependencies.multistore-static-config.version" - }, - { - "type": "toml", - "path": "Cargo.toml", - "jsonpath": "$.workspace.dependencies.multistore-sts.version" - }, - { - "type": "toml", - "path": "Cargo.toml", - "jsonpath": "$.workspace.dependencies.multistore-metering.version" - }, - { - "type": "toml", - "path": "Cargo.toml", - "jsonpath": "$.workspace.dependencies.multistore-cf-workers.version" - }, - { - "type": "toml", - "path": "Cargo.toml", - "jsonpath": "$.workspace.dependencies.multistore-oidc-provider.version" - }, - { - "type": "toml", - "path": "Cargo.toml", - "jsonpath": "$.workspace.dependencies.multistore-path-mapping.version" + "type": "generic", + "path": "Cargo.toml" }, { "type": "toml",