Skip to content

Commit 01333b9

Browse files
NatoandrodestifoYohe-Am
authored
fix(release): Fix fat CLI compilation (#730)
- Fix fat CLI compilation - Bump to 0.4.2 - Bump wasmtime to 21 - Bump rust to 1.78.0 - [x] The change comes with new or modified tests - [ ] Hard-to-understand functions have explanatory comments - [ ] End-user documentation is updated to reflect the change --------- Signed-off-by: Yohe-Am <[email protected]> Co-authored-by: destifo <[email protected]> Co-authored-by: Yohe-Am <[email protected]>
1 parent de066d7 commit 01333b9

File tree

55 files changed

+722
-460
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+722
-460
lines changed

‎.ghjk/lock.json

Lines changed: 165 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -431,6 +431,117 @@
431431
}
432432
},
433433
"portRef": "[email protected]"
434+
},
435+
"1a32ccb180571a9900a107e159612ebceee73dde599642b53e5ad5d0a7754a4a": {
436+
"version": "0.2.5",
437+
"depConfigs": {
438+
"cargo_binstall_ghrel": {
439+
"version": "v1.6.4",
440+
"depConfigs": {},
441+
"portRef": "[email protected]"
442+
},
443+
"rust_rustup": {
444+
"version": "1.77.2",
445+
"depConfigs": {
446+
"rustup_rustlang": {
447+
"version": "1.27.0",
448+
"depConfigs": {
449+
"git_aa": {
450+
"version": "2.40.1",
451+
"depConfigs": {},
452+
"portRef": "[email protected]"
453+
}
454+
},
455+
"portRef": "[email protected]"
456+
}
457+
},
458+
"portRef": "[email protected]",
459+
"profile": "minimal"
460+
}
461+
},
462+
"portRef": "[email protected]",
463+
"crateName": "cross",
464+
"locked": true
465+
},
466+
"822c6d037dbb95cf180fa5a8e62786c57af9488d40ba3d6ec4727b590fd4eeda": {
467+
"version": "1.2.4",
468+
"depConfigs": {
469+
"node_org": {
470+
"version": "v20.8.0",
471+
"depConfigs": {
472+
"tar_aa": {
473+
"version": "1.34",
474+
"depConfigs": {},
475+
"portRef": "[email protected]"
476+
}
477+
},
478+
"portRef": "[email protected]"
479+
}
480+
},
481+
"portRef": "[email protected]",
482+
"packageName": "@bytecodealliance/jco"
483+
},
484+
"919cc86bfec50bb6aadfb65d530e8625037f15b4041d28a840d54149be239889": {
485+
"version": "0.116.1",
486+
"depConfigs": {
487+
"cargo_binstall_ghrel": {
488+
"version": "v1.6.4",
489+
"depConfigs": {},
490+
"portRef": "[email protected]"
491+
},
492+
"rust_rustup": {
493+
"version": "1.77.2",
494+
"depConfigs": {
495+
"rustup_rustlang": {
496+
"version": "1.27.0",
497+
"depConfigs": {
498+
"git_aa": {
499+
"version": "2.40.1",
500+
"depConfigs": {},
501+
"portRef": "[email protected]"
502+
}
503+
},
504+
"portRef": "[email protected]"
505+
}
506+
},
507+
"portRef": "[email protected]",
508+
"profile": "minimal"
509+
}
510+
},
511+
"portRef": "[email protected]",
512+
"crateName": "wasm-opt",
513+
"locked": true
514+
},
515+
"a78b841fa383b2dcf4e40f8e969106fbb3c09c6d02c92f77b9f8e1b0d1f7fd72": {
516+
"version": "1.208.1",
517+
"depConfigs": {
518+
"cargo_binstall_ghrel": {
519+
"version": "v1.6.4",
520+
"depConfigs": {},
521+
"portRef": "[email protected]"
522+
},
523+
"rust_rustup": {
524+
"version": "1.77.2",
525+
"depConfigs": {
526+
"rustup_rustlang": {
527+
"version": "1.27.0",
528+
"depConfigs": {
529+
"git_aa": {
530+
"version": "2.40.1",
531+
"depConfigs": {},
532+
"portRef": "[email protected]"
533+
}
534+
},
535+
"portRef": "[email protected]"
536+
}
537+
},
538+
"portRef": "[email protected]",
539+
"profile": "minimal"
540+
}
541+
},
542+
"portRef": "[email protected]",
543+
"crateName": "wasm-tools",
544+
"locked": true
434545
}
435546
}
436547
},
@@ -448,13 +559,14 @@
448559
"6c4eb5db74544926094ea3be684f453ac448da0a",
449560
"0dac7df77bad6ba3f8a46710f1199cf36b260c82",
450561
"fefe1d7a6a79be5dedaf34f4c7e5c00bd6f41554",
451-
"a4c9551574e821b184e492ffbdbf295311099397",
452-
"c69d5f47d8bede1fc7a55bc46ca5f0f2c9252719",
562+
"2c6e03fd977170941f6f43c75652fea6e50f5189",
563+
"d286ef85d0b65f1a144ac4bb57827c1094d50870",
453564
"2aedace78ffe026f5c0918231de4f7f9050aab1c",
454565
"c13712d0a06c2329378872201d5cb51e0575bed9",
455566
"9e72a9f857bd9b14b47702b5b8ee660833828d4b",
456-
"cfe6640502ddf9772073889af75888d361b1f2b9",
567+
"69cc04434a8b51a9d34210383f1a931646772e3b",
457568
"8e5e02544073c4733d8f2156c404a0dd524cdaaf",
569+
"54eba38cb79f88fca14cd3185e5bec0c3dd02682",
458570
"e05f859f4a734a85fd3439f9b0fc0de1e733bdac",
459571
"38285a3b335e394ccce5ac5d59e15f660bfa4cc9",
460572
"7bbf00da8e265c56c2bff5bb7d89ba806e2590d2",
@@ -677,8 +789,8 @@
677789
"moduleSpecifier": "https://raw.githubusercontent.com/metatypedev/ghjk/2725af8/ports/temporal_cli.ts"
678790
}
679791
},
680-
"a4c9551574e821b184e492ffbdbf295311099397": {
681-
"version": "0.116.0",
792+
"2c6e03fd977170941f6f43c75652fea6e50f5189": {
793+
"version": "0.116.1",
682794
"depConfigs": {
683795
"rust_rustup": {
684796
"portRef": "[email protected]",
@@ -722,8 +834,8 @@
722834
"crateName": "wasm-opt",
723835
"locked": true
724836
},
725-
"c69d5f47d8bede1fc7a55bc46ca5f0f2c9252719": {
726-
"version": "1.0.53",
837+
"d286ef85d0b65f1a144ac4bb57827c1094d50870": {
838+
"version": "1.208.1",
727839
"depConfigs": {
728840
"rust_rustup": {
729841
"portRef": "[email protected]",
@@ -851,8 +963,8 @@
851963
"moduleSpecifier": "https://raw.githubusercontent.com/metatypedev/ghjk/2725af8/ports/pnpm.ts"
852964
}
853965
},
854-
"cfe6640502ddf9772073889af75888d361b1f2b9": {
855-
"version": "1.0.0",
966+
"69cc04434a8b51a9d34210383f1a931646772e3b": {
967+
"version": "1.2.4",
856968
"port": {
857969
"ty": "denoWorker@v1",
858970
"name": "npmi_npm",
@@ -921,6 +1033,50 @@
9211033
},
9221034
"packageName": "node-gyp"
9231035
},
1036+
"54eba38cb79f88fca14cd3185e5bec0c3dd02682": {
1037+
"depConfigs": {
1038+
"rust_rustup": {
1039+
"portRef": "[email protected]",
1040+
"profile": "minimal"
1041+
}
1042+
},
1043+
"port": {
1044+
"ty": "denoWorker@v1",
1045+
"name": "cargobi_cratesio",
1046+
"platforms": [
1047+
"x86_64-linux",
1048+
"aarch64-linux",
1049+
"x86_64-darwin",
1050+
"aarch64-darwin",
1051+
"x86_64-windows",
1052+
"aarch64-windows",
1053+
"x86_64-freebsd",
1054+
"aarch64-freebsd",
1055+
"x86_64-netbsd",
1056+
"aarch64-netbsd",
1057+
"x86_64-aix",
1058+
"aarch64-aix",
1059+
"x86_64-solaris",
1060+
"aarch64-solaris",
1061+
"x86_64-illumos",
1062+
"aarch64-illumos",
1063+
"x86_64-android",
1064+
"aarch64-android"
1065+
],
1066+
"version": "0.1.0",
1067+
"deps": [
1068+
{
1069+
"name": "cargo_binstall_ghrel"
1070+
},
1071+
{
1072+
"name": "rust_rustup"
1073+
}
1074+
],
1075+
"moduleSpecifier": "https://raw.githubusercontent.com/metatypedev/ghjk/2725af8/ports/cargobi.ts"
1076+
},
1077+
"crateName": "cross",
1078+
"locked": true
1079+
},
9241080
"e05f859f4a734a85fd3439f9b0fc0de1e733bdac": {
9251081
"version": "v2.4.0",
9261082
"port": {

‎.github/workflows/merge.yml

Lines changed: 119 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,119 @@
1+
on:
2+
merge_group:
3+
types:
4+
- checks_requested
5+
6+
env:
7+
GHJK_VERSION: "2725af8"
8+
DENO_VERSION: "1.41.0"
9+
RUST_BACKTRACE: "full"
10+
RUST_LOG: "info,swc_ecma_codegen=off,tracing::span=off"
11+
DENO_DIR: deno-dir
12+
13+
jobs:
14+
changes:
15+
runs-on: ubuntu-latest
16+
permissions:
17+
pull-requests: read
18+
steps:
19+
- uses: actions/checkout@v4
20+
- uses: dorny/paths-filter@v3
21+
id: filter
22+
with:
23+
filters: |
24+
website:
25+
- '.github/workflows/tests.yml'
26+
- 'website/**'
27+
meta-cli:
28+
- '.github/workflows/tests.yml'
29+
- 'libs/**'
30+
- 'meta-cli/**'
31+
- 'Cargo.lock'
32+
typegate:
33+
- '.github/workflows/tests.yml'
34+
- 'libs/**'
35+
- 'typegate/**'
36+
- 'meta-cli/**'
37+
- 'Cargo.lock'
38+
full:
39+
- '.github/workflows/tests.yml'
40+
- 'libs/**'
41+
- 'typegate/**'
42+
- 'typegraph/**'
43+
- 'meta-cli/**'
44+
- 'Cargo.lock'
45+
- 'examples/**'
46+
rust:
47+
- '.github/workflows/tests.yml'
48+
- 'libs/**'
49+
- 'Cargo.lock'
50+
outputs:
51+
website: ${{ steps.filter.outputs.website }}
52+
meta-cli: ${{ steps.filter.outputs.meta-cli }}
53+
typegate: ${{ steps.filter.outputs.typegate }}
54+
full: ${{ steps.filter.outputs.full }}
55+
rust: ${{ steps.filter.outputs.rust }}
56+
57+
58+
test-meta-cli-compat:
59+
needs: changes
60+
if: ${{ needs.changes.outputs.meta-cli == 'true' }}
61+
runs-on: "${{ matrix.os }}"
62+
strategy:
63+
matrix:
64+
include:
65+
- os: macos-13
66+
activate: "source .venv/bin/activate"
67+
- os: macos-14
68+
activate: "source .venv/bin/activate"
69+
#- os: windows-latest
70+
# activate: '.venv\Scripts\activate.bat'
71+
steps:
72+
- uses: actions/checkout@v4
73+
- uses: denoland/setup-deno@v1
74+
with:
75+
deno-version: ${{ env.DENO_VERSION }}
76+
- name: Cache deno dir
77+
uses: actions/cache@v4
78+
with:
79+
path: ${{ env.DENO_DIR }}
80+
key: deno-mac-${{ hashFiles('**/deno.lock') }}
81+
- uses: dsherret/rust-toolchain-file@v1
82+
- uses: Swatinem/rust-cache@v2
83+
with:
84+
shared-key: ${{ runner.os }}-rust-${{ hashFiles('**/rust-toolchain.toml') }}-${{ hashFiles('**/Cargo.lock') }}
85+
- name: Cache .venv dir
86+
uses: actions/cache@v4
87+
with:
88+
path: .venv
89+
key: ${{ matrix.os }}-venv-${{ hashFiles('**/poetry.lock', '.ghjk/lock.json') }}
90+
- uses: metatypedev/setup-ghjk@2e8bbf084060a18828338a7cdd43fde6feb2a3cc
91+
with:
92+
# temporary fix
93+
cache-key-prefix: ${{ matrix.os }}
94+
- shell: bash
95+
env:
96+
WASM_FILE: target/debug/typegraph_core.wasm
97+
run: |
98+
python3 -m venv .venv
99+
${{ matrix.activate }}
100+
101+
cd typegraph/python
102+
poetry install --no-root
103+
cd ../..
104+
poetry install --no-root
105+
106+
deno cache --import-map typegate/import_map.json typegate/src/main.ts typegate/tests/utils/mod.ts
107+
108+
cargo build -p typegraph_core --target wasm32-unknown-unknown --target-dir target/wasm
109+
mkdir -p $(dirname $WASM_FILE)
110+
wasm-opt -Oz target/wasm/wasm32-unknown-unknown/debug/typegraph_core.wasm -o $WASM_FILE.opt
111+
wasm-tools component new $WASM_FILE.opt -o $WASM_FILE
112+
rm -rf typegraph/python/typegraph/gen
113+
poetry run python -m wasmtime.bindgen $WASM_FILE --out-dir typegraph/python/typegraph/gen
114+
115+
cargo run --locked --package meta-cli -- --help
116+
cargo test --locked --package meta-cli
117+
118+
# check the fat CLI build
119+
cargo run --locked --package meta-cli --features typegate -- --help

0 commit comments

Comments
 (0)