From 2f842b2535106914903ce6801f0c64aebf2da9ef Mon Sep 17 00:00:00 2001 From: Stefan Date: Mon, 25 Aug 2025 16:28:55 +0200 Subject: [PATCH 1/2] fix: rust version bump --- actions/cargo-version-action/dist/index.js | 4 ++++ actions/cargo-version-action/src/cargo.ts | 4 ++++ core/expression/Cargo.toml | 4 ++-- core/macros/Cargo.toml | 1 - core/types/Cargo.toml | 1 - 5 files changed, 10 insertions(+), 4 deletions(-) diff --git a/actions/cargo-version-action/dist/index.js b/actions/cargo-version-action/dist/index.js index d981298c..06c946e0 100644 --- a/actions/cargo-version-action/dist/index.js +++ b/actions/cargo-version-action/dist/index.js @@ -34068,10 +34068,14 @@ var toml = __nccwpck_require__(2132); const versionRegex = /version = "[0-9]+\.[0-9]+\.[0-9]+"$/im; const expressionDep = /zen-expression =.*$/im; const templateDep = /zen-tmpl =.*$/im; +const macroDep = /zen-macros =.*$/im; +const typesDep = /zen-types =.*$/im; const updateCargoContents = (contents, { version }) => { return contents .replace(versionRegex, `version = "${version}"`) .replace(expressionDep, `zen-expression = { path = "../expression", version = "${version}" }`) + .replace(macroDep, `zen-macros = { path = "../macros", version = "${version}" }`) + .replace(typesDep, `zen-types = { path = "../types", version = "${version}" }`) .replace(templateDep, `zen-tmpl = { path = "../template", version = "${version}" }`); }; const getCargoVersion = (contents) => { diff --git a/actions/cargo-version-action/src/cargo.ts b/actions/cargo-version-action/src/cargo.ts index eb3efdb1..2ce55e92 100644 --- a/actions/cargo-version-action/src/cargo.ts +++ b/actions/cargo-version-action/src/cargo.ts @@ -7,11 +7,15 @@ type UpdateCargoOptions = { const versionRegex = /version = "[0-9]+\.[0-9]+\.[0-9]+"$/im; const expressionDep = /zen-expression =.*$/im; const templateDep = /zen-tmpl =.*$/im; +const macroDep = /zen-macros =.*$/im; +const typesDep = /zen-types =.*$/im; export const updateCargoContents = (contents: string, { version }: UpdateCargoOptions): string => { return contents .replace(versionRegex, `version = "${version}"`) .replace(expressionDep, `zen-expression = { path = "../expression", version = "${version}" }`) + .replace(macroDep, `zen-macros = { path = "../macros", version = "${version}" }`) + .replace(typesDep, `zen-types = { path = "../types", version = "${version}" }`) .replace(templateDep, `zen-tmpl = { path = "../template", version = "${version}" }`); }; diff --git a/core/expression/Cargo.toml b/core/expression/Cargo.toml index 41236761..dc8127e2 100644 --- a/core/expression/Cargo.toml +++ b/core/expression/Cargo.toml @@ -30,8 +30,8 @@ nohash-hasher = "0.2.0" strsim = "0.11" iana-time-zone = "0.1" -zen-macros = { path = "../macros" } -zen-types = { path = "../types" } +zen-macros = { path = "../macros", version = "0.50.0" } +zen-types = { path = "../types", version = "0.50.0" } [dev-dependencies] criterion = { workspace = true } diff --git a/core/macros/Cargo.toml b/core/macros/Cargo.toml index 0f20877b..5e203d1b 100644 --- a/core/macros/Cargo.toml +++ b/core/macros/Cargo.toml @@ -2,7 +2,6 @@ name = "zen-macros" version = "0.50.0" edition = "2024" -publish = false [lib] proc-macro = true diff --git a/core/types/Cargo.toml b/core/types/Cargo.toml index 87b1111f..f532cde7 100644 --- a/core/types/Cargo.toml +++ b/core/types/Cargo.toml @@ -2,7 +2,6 @@ name = "zen-types" version = "0.50.0" edition = "2024" -publish = false [dependencies] ahash = { workspace = true } From 4c8898ba37f598b4c98590bbbbeaf8848496dbd9 Mon Sep 17 00:00:00 2001 From: Stefan Date: Mon, 25 Aug 2025 16:36:36 +0200 Subject: [PATCH 2/2] add publish cmd --- .github/workflows/rust.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/rust.yaml b/.github/workflows/rust.yaml index bfd0e8c8..dd7b6ee4 100644 --- a/.github/workflows/rust.yaml +++ b/.github/workflows/rust.yaml @@ -120,6 +120,12 @@ jobs: - name: Login to Crates.IO run: cargo login ${{ secrets.CRATES_TOKEN }} + - name: Publish Macros + run: cd core/macros && cargo publish + + - name: Publish Types + run: cd core/types && cargo publish + - name: Publish Expression run: cd core/expression && cargo publish