Skip to content

fix(release): Fix fat CLI compilation #730

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 18 commits into from
May 22, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
174 changes: 165 additions & 9 deletions .ghjk/lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -431,6 +431,117 @@
}
},
"portRef": "[email protected]"
},
"1a32ccb180571a9900a107e159612ebceee73dde599642b53e5ad5d0a7754a4a": {
"version": "0.2.5",
"depConfigs": {
"cargo_binstall_ghrel": {
"version": "v1.6.4",
"depConfigs": {},
"portRef": "[email protected]"
},
"rust_rustup": {
"version": "1.77.2",
"depConfigs": {
"rustup_rustlang": {
"version": "1.27.0",
"depConfigs": {
"git_aa": {
"version": "2.40.1",
"depConfigs": {},
"portRef": "[email protected]"
}
},
"portRef": "[email protected]"
}
},
"portRef": "[email protected]",
"profile": "minimal"
}
},
"portRef": "[email protected]",
"crateName": "cross",
"locked": true
},
"822c6d037dbb95cf180fa5a8e62786c57af9488d40ba3d6ec4727b590fd4eeda": {
"version": "1.2.4",
"depConfigs": {
"node_org": {
"version": "v20.8.0",
"depConfigs": {
"tar_aa": {
"version": "1.34",
"depConfigs": {},
"portRef": "[email protected]"
}
},
"portRef": "[email protected]"
}
},
"portRef": "[email protected]",
"packageName": "@bytecodealliance/jco"
},
"919cc86bfec50bb6aadfb65d530e8625037f15b4041d28a840d54149be239889": {
"version": "0.116.1",
"depConfigs": {
"cargo_binstall_ghrel": {
"version": "v1.6.4",
"depConfigs": {},
"portRef": "[email protected]"
},
"rust_rustup": {
"version": "1.77.2",
"depConfigs": {
"rustup_rustlang": {
"version": "1.27.0",
"depConfigs": {
"git_aa": {
"version": "2.40.1",
"depConfigs": {},
"portRef": "[email protected]"
}
},
"portRef": "[email protected]"
}
},
"portRef": "[email protected]",
"profile": "minimal"
}
},
"portRef": "[email protected]",
"crateName": "wasm-opt",
"locked": true
},
"a78b841fa383b2dcf4e40f8e969106fbb3c09c6d02c92f77b9f8e1b0d1f7fd72": {
"version": "1.208.1",
"depConfigs": {
"cargo_binstall_ghrel": {
"version": "v1.6.4",
"depConfigs": {},
"portRef": "[email protected]"
},
"rust_rustup": {
"version": "1.77.2",
"depConfigs": {
"rustup_rustlang": {
"version": "1.27.0",
"depConfigs": {
"git_aa": {
"version": "2.40.1",
"depConfigs": {},
"portRef": "[email protected]"
}
},
"portRef": "[email protected]"
}
},
"portRef": "[email protected]",
"profile": "minimal"
}
},
"portRef": "[email protected]",
"crateName": "wasm-tools",
"locked": true
}
}
},
Expand All @@ -448,13 +559,14 @@
"6c4eb5db74544926094ea3be684f453ac448da0a",
"0dac7df77bad6ba3f8a46710f1199cf36b260c82",
"fefe1d7a6a79be5dedaf34f4c7e5c00bd6f41554",
"a4c9551574e821b184e492ffbdbf295311099397",
"c69d5f47d8bede1fc7a55bc46ca5f0f2c9252719",
"2c6e03fd977170941f6f43c75652fea6e50f5189",
"d286ef85d0b65f1a144ac4bb57827c1094d50870",
"2aedace78ffe026f5c0918231de4f7f9050aab1c",
"c13712d0a06c2329378872201d5cb51e0575bed9",
"9e72a9f857bd9b14b47702b5b8ee660833828d4b",
"cfe6640502ddf9772073889af75888d361b1f2b9",
"69cc04434a8b51a9d34210383f1a931646772e3b",
"8e5e02544073c4733d8f2156c404a0dd524cdaaf",
"54eba38cb79f88fca14cd3185e5bec0c3dd02682",
"e05f859f4a734a85fd3439f9b0fc0de1e733bdac",
"38285a3b335e394ccce5ac5d59e15f660bfa4cc9",
"7bbf00da8e265c56c2bff5bb7d89ba806e2590d2",
Expand Down Expand Up @@ -677,8 +789,8 @@
"moduleSpecifier": "https://raw.githubusercontent.com/metatypedev/ghjk/2725af8/ports/temporal_cli.ts"
}
},
"a4c9551574e821b184e492ffbdbf295311099397": {
"version": "0.116.0",
"2c6e03fd977170941f6f43c75652fea6e50f5189": {
"version": "0.116.1",
"depConfigs": {
"rust_rustup": {
"portRef": "[email protected]",
Expand Down Expand Up @@ -722,8 +834,8 @@
"crateName": "wasm-opt",
"locked": true
},
"c69d5f47d8bede1fc7a55bc46ca5f0f2c9252719": {
"version": "1.0.53",
"d286ef85d0b65f1a144ac4bb57827c1094d50870": {
"version": "1.208.1",
"depConfigs": {
"rust_rustup": {
"portRef": "[email protected]",
Expand Down Expand Up @@ -851,8 +963,8 @@
"moduleSpecifier": "https://raw.githubusercontent.com/metatypedev/ghjk/2725af8/ports/pnpm.ts"
}
},
"cfe6640502ddf9772073889af75888d361b1f2b9": {
"version": "1.0.0",
"69cc04434a8b51a9d34210383f1a931646772e3b": {
"version": "1.2.4",
"port": {
"ty": "denoWorker@v1",
"name": "npmi_npm",
Expand Down Expand Up @@ -921,6 +1033,50 @@
},
"packageName": "node-gyp"
},
"54eba38cb79f88fca14cd3185e5bec0c3dd02682": {
"depConfigs": {
"rust_rustup": {
"portRef": "[email protected]",
"profile": "minimal"
}
},
"port": {
"ty": "denoWorker@v1",
"name": "cargobi_cratesio",
"platforms": [
"x86_64-linux",
"aarch64-linux",
"x86_64-darwin",
"aarch64-darwin",
"x86_64-windows",
"aarch64-windows",
"x86_64-freebsd",
"aarch64-freebsd",
"x86_64-netbsd",
"aarch64-netbsd",
"x86_64-aix",
"aarch64-aix",
"x86_64-solaris",
"aarch64-solaris",
"x86_64-illumos",
"aarch64-illumos",
"x86_64-android",
"aarch64-android"
],
"version": "0.1.0",
"deps": [
{
"name": "cargo_binstall_ghrel"
},
{
"name": "rust_rustup"
}
],
"moduleSpecifier": "https://raw.githubusercontent.com/metatypedev/ghjk/2725af8/ports/cargobi.ts"
},
"crateName": "cross",
"locked": true
},
"e05f859f4a734a85fd3439f9b0fc0de1e733bdac": {
"version": "v2.4.0",
"port": {
Expand Down
119 changes: 119 additions & 0 deletions .github/workflows/merge.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,119 @@
on:
merge_group:
types:
- checks_requested

env:
GHJK_VERSION: "2725af8"
DENO_VERSION: "1.41.0"
RUST_BACKTRACE: "full"
RUST_LOG: "info,swc_ecma_codegen=off,tracing::span=off"
DENO_DIR: deno-dir

jobs:
changes:
runs-on: ubuntu-latest
permissions:
pull-requests: read
steps:
- uses: actions/checkout@v4
- uses: dorny/paths-filter@v3
id: filter
with:
filters: |
website:
- '.github/workflows/tests.yml'
- 'website/**'
meta-cli:
- '.github/workflows/tests.yml'
- 'libs/**'
- 'meta-cli/**'
- 'Cargo.lock'
typegate:
- '.github/workflows/tests.yml'
- 'libs/**'
- 'typegate/**'
- 'meta-cli/**'
- 'Cargo.lock'
full:
- '.github/workflows/tests.yml'
- 'libs/**'
- 'typegate/**'
- 'typegraph/**'
- 'meta-cli/**'
- 'Cargo.lock'
- 'examples/**'
rust:
- '.github/workflows/tests.yml'
- 'libs/**'
- 'Cargo.lock'
outputs:
website: ${{ steps.filter.outputs.website }}
meta-cli: ${{ steps.filter.outputs.meta-cli }}
typegate: ${{ steps.filter.outputs.typegate }}
full: ${{ steps.filter.outputs.full }}
rust: ${{ steps.filter.outputs.rust }}


test-meta-cli-compat:
needs: changes
if: ${{ needs.changes.outputs.meta-cli == 'true' }}
runs-on: "${{ matrix.os }}"
strategy:
matrix:
include:
- os: macos-13
activate: "source .venv/bin/activate"
- os: macos-14
activate: "source .venv/bin/activate"
#- os: windows-latest
# activate: '.venv\Scripts\activate.bat'
steps:
- uses: actions/checkout@v4
- uses: denoland/setup-deno@v1
with:
deno-version: ${{ env.DENO_VERSION }}
- name: Cache deno dir
uses: actions/cache@v4
with:
path: ${{ env.DENO_DIR }}
key: deno-mac-${{ hashFiles('**/deno.lock') }}
- uses: dsherret/rust-toolchain-file@v1
- uses: Swatinem/rust-cache@v2
with:
shared-key: ${{ runner.os }}-rust-${{ hashFiles('**/rust-toolchain.toml') }}-${{ hashFiles('**/Cargo.lock') }}
- name: Cache .venv dir
uses: actions/cache@v4
with:
path: .venv
key: ${{ matrix.os }}-venv-${{ hashFiles('**/poetry.lock', '.ghjk/lock.json') }}
- uses: metatypedev/setup-ghjk@2e8bbf084060a18828338a7cdd43fde6feb2a3cc
with:
# temporary fix
cache-key-prefix: ${{ matrix.os }}
- shell: bash
env:
WASM_FILE: target/debug/typegraph_core.wasm
run: |
python3 -m venv .venv
${{ matrix.activate }}

cd typegraph/python
poetry install --no-root
cd ../..
poetry install --no-root

deno cache --import-map typegate/import_map.json typegate/src/main.ts typegate/tests/utils/mod.ts

cargo build -p typegraph_core --target wasm32-unknown-unknown --target-dir target/wasm
mkdir -p $(dirname $WASM_FILE)
wasm-opt -Oz target/wasm/wasm32-unknown-unknown/debug/typegraph_core.wasm -o $WASM_FILE.opt
wasm-tools component new $WASM_FILE.opt -o $WASM_FILE
rm -rf typegraph/python/typegraph/gen
poetry run python -m wasmtime.bindgen $WASM_FILE --out-dir typegraph/python/typegraph/gen

cargo run --locked --package meta-cli -- --help
cargo test --locked --package meta-cli

# check the fat CLI build
cargo run --locked --package meta-cli --features typegate -- --help
Loading
Loading