From 7a221f62cef4dce2f9f2f961f0a5a855134ac22c Mon Sep 17 00:00:00 2001 From: Yohe-Am <56622350+Yohe-Am@users.noreply.github.com> Date: Mon, 2 Sep 2024 17:23:30 +0300 Subject: [PATCH] chore: bump to v0.4.9 (#831) - Bump version to v0.4.9 - Fix issue with cross config context --- Cargo.lock | 16 ++++++++-------- Cargo.toml | 2 +- examples/templates/deno/compose.yml | 2 +- examples/templates/node/compose.yml | 2 +- examples/templates/node/package.json | 2 +- examples/templates/python/compose.yml | 2 +- examples/templates/python/pyproject.toml | 4 ++-- pyproject.toml | 2 +- src/meta-lsp/package.json | 2 +- src/meta-lsp/ts-language-server/package.json | 2 +- .../vscode-metatype-support/package.json | 2 +- src/pyrt_wit_wire/pyproject.toml | 2 +- src/typegate/src/runtimes/wit_wire/mod.ts | 2 +- src/typegraph/core/Cargo.toml | 2 +- src/typegraph/core/src/global_store.rs | 2 +- src/typegraph/deno/deno.json | 2 +- src/typegraph/python/pyproject.toml | 2 +- src/typegraph/python/typegraph/__init__.py | 2 +- src/xtask/Cargo.toml | 2 +- tests/metagen/__snapshots__/metagen_test.ts.snap | 4 ++-- tests/runtimes/wasm_reflected/rust/Cargo.toml | 2 +- tools/Cross.toml | 1 + tools/consts.ts | 2 +- tools/cross.Dockerfile | 4 ++-- 24 files changed, 34 insertions(+), 33 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index bb4c512421..0e192c8836 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1530,7 +1530,7 @@ dependencies = [ [[package]] name = "common" -version = "0.4.9-rc2" +version = "0.4.9" dependencies = [ "anyhow", "async-trait", @@ -6672,7 +6672,7 @@ dependencies = [ [[package]] name = "meta-cli" -version = "0.4.9-rc2" +version = "0.4.9" dependencies = [ "actix", "assert_cmd", @@ -6739,7 +6739,7 @@ dependencies = [ [[package]] name = "metagen" -version = "0.4.9-rc2" +version = "0.4.9" dependencies = [ "color-eyre", "common", @@ -7066,7 +7066,7 @@ dependencies = [ [[package]] name = "mt_deno" -version = "0.4.9-rc2" +version = "0.4.9" dependencies = [ "anyhow", "deno", @@ -12454,7 +12454,7 @@ dependencies = [ [[package]] name = "typegate" -version = "0.4.9-rc2" +version = "0.4.9" dependencies = [ "colored", "env_logger 0.11.0", @@ -12467,7 +12467,7 @@ dependencies = [ [[package]] name = "typegate_engine" -version = "0.4.9-rc2" +version = "0.4.9" dependencies = [ "anyhow", "base64 0.22.1", @@ -12507,7 +12507,7 @@ dependencies = [ [[package]] name = "typegraph_core" -version = "0.4.9-rc2" +version = "0.4.9" dependencies = [ "anyhow", "color-eyre", @@ -14229,7 +14229,7 @@ checksum = "791978798f0597cfc70478424c2b4fdc2b7a8024aaff78497ef00f24ef674193" [[package]] name = "xtask" -version = "0.4.9-rc2" +version = "0.4.9" dependencies = [ "anyhow", "clap", diff --git a/Cargo.toml b/Cargo.toml index 813ec09861..2715f2f05e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -20,7 +20,7 @@ exclude = [ ] [workspace.package] -version = "0.4.9-rc2" +version = "0.4.9" edition = "2021" [workspace.dependencies] diff --git a/examples/templates/deno/compose.yml b/examples/templates/deno/compose.yml index 90863d7b5a..2f48f02f44 100644 --- a/examples/templates/deno/compose.yml +++ b/examples/templates/deno/compose.yml @@ -1,6 +1,6 @@ services: typegate: - image: ghcr.io/metatypedev/typegate:v0.4.9-rc2 + image: ghcr.io/metatypedev/typegate:v0.4.9 restart: always ports: - "7890:7890" diff --git a/examples/templates/node/compose.yml b/examples/templates/node/compose.yml index 90863d7b5a..2f48f02f44 100644 --- a/examples/templates/node/compose.yml +++ b/examples/templates/node/compose.yml @@ -1,6 +1,6 @@ services: typegate: - image: ghcr.io/metatypedev/typegate:v0.4.9-rc2 + image: ghcr.io/metatypedev/typegate:v0.4.9 restart: always ports: - "7890:7890" diff --git a/examples/templates/node/package.json b/examples/templates/node/package.json index 9c6327ab33..e0345ca6fe 100644 --- a/examples/templates/node/package.json +++ b/examples/templates/node/package.json @@ -6,7 +6,7 @@ "dev": "MCLI_LOADER_CMD='npm x tsx' meta dev" }, "dependencies": { - "@typegraph/sdk": "^0.4.9-rc2" + "@typegraph/sdk": "^0.4.9" }, "devDependencies": { "tsx": "^3.13.0", diff --git a/examples/templates/python/compose.yml b/examples/templates/python/compose.yml index 90863d7b5a..2f48f02f44 100644 --- a/examples/templates/python/compose.yml +++ b/examples/templates/python/compose.yml @@ -1,6 +1,6 @@ services: typegate: - image: ghcr.io/metatypedev/typegate:v0.4.9-rc2 + image: ghcr.io/metatypedev/typegate:v0.4.9 restart: always ports: - "7890:7890" diff --git a/examples/templates/python/pyproject.toml b/examples/templates/python/pyproject.toml index fb63ab12f5..a7b74d0096 100644 --- a/examples/templates/python/pyproject.toml +++ b/examples/templates/python/pyproject.toml @@ -1,12 +1,12 @@ [tool.poetry] name = "example" -version = "0.4.9-rc2" +version = "0.4.9" description = "" authors = [] [tool.poetry.dependencies] python = ">=3.8,<4.0" -typegraph = "0.4.9-rc2" +typegraph = "0.4.9" [build-system] requires = ["poetry-core"] diff --git a/pyproject.toml b/pyproject.toml index 965b1a2eba..419203cc13 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -6,7 +6,7 @@ [tool.poetry] name = "metatype" -version = "0.4.9-rc2" +version = "0.4.9" description = "" authors = [] diff --git a/src/meta-lsp/package.json b/src/meta-lsp/package.json index 41329abd6c..9b0687f433 100644 --- a/src/meta-lsp/package.json +++ b/src/meta-lsp/package.json @@ -4,7 +4,7 @@ "description": "VSCode extension for Metatype support", "icon": "logo.png", "author": "Metatype Team", - "version": "0.4.9-rc2", + "version": "0.4.9", "repository": { "type": "git", "url": "https://github.com/metatypedev/metatype" diff --git a/src/meta-lsp/ts-language-server/package.json b/src/meta-lsp/ts-language-server/package.json index 4a33da98a9..ff3c9155f9 100644 --- a/src/meta-lsp/ts-language-server/package.json +++ b/src/meta-lsp/ts-language-server/package.json @@ -2,7 +2,7 @@ "name": "typegraph-ts-server", "description": "TypeScript language server for TypeGraph", "author": "Metatype Team", - "version": "0.4.9-rc2", + "version": "0.4.9", "repository": { "type": "git", "url": "https://github.com/metatypedev/metatype" diff --git a/src/meta-lsp/vscode-metatype-support/package.json b/src/meta-lsp/vscode-metatype-support/package.json index 2de4921803..9dbcc40233 100644 --- a/src/meta-lsp/vscode-metatype-support/package.json +++ b/src/meta-lsp/vscode-metatype-support/package.json @@ -2,7 +2,7 @@ "name": "vscode-metatype-support", "description": "VSCode extension for Metatype support", "author": "Metatype Team", - "version": "0.4.9-rc2", + "version": "0.4.9", "repository": { "type": "git", "url": "https://github.com/metatypedev/metatype" diff --git a/src/pyrt_wit_wire/pyproject.toml b/src/pyrt_wit_wire/pyproject.toml index f54f38b794..cb728a7671 100644 --- a/src/pyrt_wit_wire/pyproject.toml +++ b/src/pyrt_wit_wire/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "pyrt_wit_wire" -version = "0.4.9-rc2" +version = "0.4.9" description = "Wasm component implementing the PythonRuntime host using wit_wire protocol." license = "Elastic-2.0" readme = "README.md" diff --git a/src/typegate/src/runtimes/wit_wire/mod.ts b/src/typegate/src/runtimes/wit_wire/mod.ts index ea665fd1d9..620df53225 100644 --- a/src/typegate/src/runtimes/wit_wire/mod.ts +++ b/src/typegate/src/runtimes/wit_wire/mod.ts @@ -9,7 +9,7 @@ import { getLogger } from "../../log.ts"; const logger = getLogger(import.meta); -const METATYPE_VERSION = "0.4.9-rc2"; +const METATYPE_VERSION = "0.4.9"; export class WitWireMessenger { static async init( diff --git a/src/typegraph/core/Cargo.toml b/src/typegraph/core/Cargo.toml index e87d66d8bb..49ecc70059 100644 --- a/src/typegraph/core/Cargo.toml +++ b/src/typegraph/core/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "typegraph_core" -version = "0.4.9-rc2" +version = "0.4.9" edition = "2021" [lib] diff --git a/src/typegraph/core/src/global_store.rs b/src/typegraph/core/src/global_store.rs index f051f29ea4..4a8462ab77 100644 --- a/src/typegraph/core/src/global_store.rs +++ b/src/typegraph/core/src/global_store.rs @@ -102,7 +102,7 @@ const PREDEFINED_DENO_FUNCTIONS: &[&str] = &["identity", "true"]; thread_local! { pub static STORE: RefCell = RefCell::new(Store::new()); - pub static SDK_VERSION: String = "0.4.9-rc2".to_owned(); + pub static SDK_VERSION: String = "0.4.9".to_owned(); } fn with_store T>(f: F) -> T { diff --git a/src/typegraph/deno/deno.json b/src/typegraph/deno/deno.json index 3f4f2c3c43..5317e1a97a 100644 --- a/src/typegraph/deno/deno.json +++ b/src/typegraph/deno/deno.json @@ -1,6 +1,6 @@ { "name": "@typegraph/sdk", - "version": "0.4.9-rc2", + "version": "0.4.9", "publish": { "exclude": [ "!src/gen", diff --git a/src/typegraph/python/pyproject.toml b/src/typegraph/python/pyproject.toml index 8df42aaf96..7a149e363b 100644 --- a/src/typegraph/python/pyproject.toml +++ b/src/typegraph/python/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "typegraph" -version = "0.4.9-rc2" +version = "0.4.9" description = "Declarative API development platform. Build backend components with WASM, Typescript and Python, no matter where and how your (legacy) systems are." authors = ["Metatype Contributors "] license = "MPL-2.0" diff --git a/src/typegraph/python/typegraph/__init__.py b/src/typegraph/python/typegraph/__init__.py index 58a6fc06a9..937eba6c6c 100644 --- a/src/typegraph/python/typegraph/__init__.py +++ b/src/typegraph/python/typegraph/__init__.py @@ -5,4 +5,4 @@ from typegraph.policy import Policy # noqa from typegraph import effects as fx # noqa -version = "0.4.9-rc2" +version = "0.4.9" diff --git a/src/xtask/Cargo.toml b/src/xtask/Cargo.toml index 678d3be2ac..269d321e91 100644 --- a/src/xtask/Cargo.toml +++ b/src/xtask/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "xtask" -version = "0.4.9-rc2" +version = "0.4.9" edition = "2021" # this allows us to exclude the rust files diff --git a/tests/metagen/__snapshots__/metagen_test.ts.snap b/tests/metagen/__snapshots__/metagen_test.ts.snap index 01cab546bd..7667e76290 100644 --- a/tests/metagen/__snapshots__/metagen_test.ts.snap +++ b/tests/metagen/__snapshots__/metagen_test.ts.snap @@ -540,7 +540,7 @@ impl Router { } pub fn init(&self, args: InitArgs) -> Result { - static MT_VERSION: &str = "0.4.9-rc2"; + static MT_VERSION: &str = "0.4.9"; if args.metatype_version != MT_VERSION { return Err(InitError::VersionMismatch(MT_VERSION.into())); } @@ -1365,7 +1365,7 @@ impl Router { } pub fn init(&self, args: InitArgs) -> Result { - static MT_VERSION: &str = "0.4.9-rc2"; + static MT_VERSION: &str = "0.4.9"; if args.metatype_version != MT_VERSION { return Err(InitError::VersionMismatch(MT_VERSION.into())); } diff --git a/tests/runtimes/wasm_reflected/rust/Cargo.toml b/tests/runtimes/wasm_reflected/rust/Cargo.toml index d1f453f863..ef234e40dc 100644 --- a/tests/runtimes/wasm_reflected/rust/Cargo.toml +++ b/tests/runtimes/wasm_reflected/rust/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "rust" -version = "0.4.9-rc2" +version = "0.4.9" edition = "2021" [lib] diff --git a/tools/Cross.toml b/tools/Cross.toml index be79a9b54a..b2ef8721a8 100644 --- a/tools/Cross.toml +++ b/tools/Cross.toml @@ -1,3 +1,4 @@ [build] dockerfile = "./tools/cross.Dockerfile" +context = ".." env.passthrough = ["DENO_SKIP_CROSS_BUILD_CHECK", "OCI", "CI"] diff --git a/tools/consts.ts b/tools/consts.ts index b1702aebc2..3c59bd96f1 100644 --- a/tools/consts.ts +++ b/tools/consts.ts @@ -1,7 +1,7 @@ // Copyright Metatype OÜ, licensed under the Elastic License 2.0. // SPDX-License-Identifier: Elastic-2.0 -export const METATYPE_VERSION = "0.4.9-rc2"; +export const METATYPE_VERSION = "0.4.9"; export const PUBLISHED_VERSION = "0.4.8"; export const GHJK_VERSION = "v0.2.1"; export const GHJK_ACTION_VERSION = "318209a9d215f70716a4ac89dbeb9653a2deb8bc"; diff --git a/tools/cross.Dockerfile b/tools/cross.Dockerfile index be1d63a394..20b71a2675 100644 --- a/tools/cross.Dockerfile +++ b/tools/cross.Dockerfile @@ -42,9 +42,9 @@ RUN curl -fsSL https://raw.github.com/metatypedev/ghjk/$GHJK_VERSION/install.sh WORKDIR /app -COPY tools/*.ts tools/ +COPY tools/ tools/ COPY ghjk.ts . -# mold breaks builds for aarch64 linux +# we don't use the oci env since mold breaks builds for aarch64 linux ENV GHJK_ENV=_rust RUN ghjk envs cook ENV BASH_ENV=$GHJK_SHARE_DIR/env.sh