Skip to content

Commit

Permalink
wip!: breaking warts
Browse files Browse the repository at this point in the history
  • Loading branch information
Yohe-Am committed Jan 4, 2025
1 parent 256f2fa commit 5504688
Show file tree
Hide file tree
Showing 49 changed files with 527 additions and 330 deletions.
212 changes: 145 additions & 67 deletions .ghjk/lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -295,6 +295,44 @@
"portRef": "[email protected]",
"pluginRepo": "https://github.com/lsanwick/asdf-jq",
"specifiedVersion": false
},
"bciqjtrxihpi27npax5rsw7dgpojy6gkpo7vwhb2opxobk24mbgmcp7q": {
"version": "0.12.1",
"buildDepConfigs": {
"cargo_binstall_ghrel": {
"version": "v1.10.18",
"buildDepConfigs": {},
"portRef": "[email protected]",
"specifiedVersion": false
},
"rust_rustup": {
"version": "1.82.0",
"buildDepConfigs": {
"rustup_rustlang": {
"version": "1.27.1",
"buildDepConfigs": {
"git_aa": {
"version": "2.47.1",
"buildDepConfigs": {},
"portRef": "[email protected]",
"specifiedVersion": false
}
},
"portRef": "[email protected]",
"specifiedVersion": false
}
},
"portRef": "[email protected]",
"profile": "default",
"components": [
"rust-src"
],
"specifiedVersion": true
}
},
"portRef": "[email protected]",
"crateName": "cargo-bloat",
"specifiedVersion": false
}
}
},
Expand All @@ -313,11 +351,11 @@
"sets": {
"ghjkEnvProvInstSet___main": {
"installs": [
"bciqjucge6yrzcawqzcljvrpmtwrocecsww6pcjwipzn5j2hfwjof7za",
"bciqe72molvtvcuj3tuh47ziue2oqd6t4qetxn3rsoa764ofup6uwjmi",
"bciqe4zlekl4uqqbhxunac7br24mrf6cdpfrfblahqa4vrgaqjujcl4i",
"bciqpu4klxr3hl6ujhmflrlfd3dxp47ijq26mnathb26ojzwkeggy5ii",
"bciqelae2kzmf7umbo62flzq2mnlhnc4ilbfmn4va2fzrqwx7w7zusji"
"bciqelae2kzmf7umbo62flzq2mnlhnc4ilbfmn4va2fzrqwx7w7zusji",
"bciqjucge6yrzcawqzcljvrpmtwrocecsww6pcjwipzn5j2hfwjof7za"
],
"allowedBuildDeps": "bciqdg64uhkvlkqyc7nli33cja3aolbcdr75qepnrhj5ojlifsvxqzgq"
},
Expand All @@ -326,26 +364,28 @@
"bciqikjfnbntvagpghawbzlfp2es6lnqzhba3qx5de7tdrmvhuzhsjqa",
"bciqfrfun7z7soj7yxzziyvmt2jnebqvneeoozk5vynmg5pa6wqynhvi",
"bciqgkc6fegmxehj4whmusfuurxyp4ayeysn6qa2t6q64baac5is7uui",
"bciqjucge6yrzcawqzcljvrpmtwrocecsww6pcjwipzn5j2hfwjof7za",
"bciqlmoqot4jk2lb2b34pldr5iiwsfm3biuipzesjkkwmc2n2o6nlw4q",
"bciqe72molvtvcuj3tuh47ziue2oqd6t4qetxn3rsoa764ofup6uwjmi",
"bciqe4zlekl4uqqbhxunac7br24mrf6cdpfrfblahqa4vrgaqjujcl4i",
"bciqpu4klxr3hl6ujhmflrlfd3dxp47ijq26mnathb26ojzwkeggy5ii",
"bciqelae2kzmf7umbo62flzq2mnlhnc4ilbfmn4va2fzrqwx7w7zusji"
"bciqelae2kzmf7umbo62flzq2mnlhnc4ilbfmn4va2fzrqwx7w7zusji",
"bciqjucge6yrzcawqzcljvrpmtwrocecsww6pcjwipzn5j2hfwjof7za"
],
"allowedBuildDeps": "bciqdg64uhkvlkqyc7nli33cja3aolbcdr75qepnrhj5ojlifsvxqzgq"
},
"ghjkEnvProvInstSet___dev": {
"installs": [
"bciqlfx3mm5hi37g75snjknph6fkniixjhnvyyfxeua7f5z4h7nnqtna",
"bciqlmoqot4jk2lb2b34pldr5iiwsfm3biuipzesjkkwmc2n2o6nlw4q",
"bciqhsrsmayibhhhcp3jmay4tnrsyhz5od6ngtaazymx3o64xxzbqiha",
"bciqikjfnbntvagpghawbzlfp2es6lnqzhba3qx5de7tdrmvhuzhsjqa",
"bciqfrfun7z7soj7yxzziyvmt2jnebqvneeoozk5vynmg5pa6wqynhvi",
"bciqgkc6fegmxehj4whmusfuurxyp4ayeysn6qa2t6q64baac5is7uui",
"bciqjucge6yrzcawqzcljvrpmtwrocecsww6pcjwipzn5j2hfwjof7za",
"bciqlmoqot4jk2lb2b34pldr5iiwsfm3biuipzesjkkwmc2n2o6nlw4q",
"bciqe72molvtvcuj3tuh47ziue2oqd6t4qetxn3rsoa764ofup6uwjmi",
"bciqe4zlekl4uqqbhxunac7br24mrf6cdpfrfblahqa4vrgaqjujcl4i",
"bciqpu4klxr3hl6ujhmflrlfd3dxp47ijq26mnathb26ojzwkeggy5ii",
"bciqelae2kzmf7umbo62flzq2mnlhnc4ilbfmn4va2fzrqwx7w7zusji"
"bciqelae2kzmf7umbo62flzq2mnlhnc4ilbfmn4va2fzrqwx7w7zusji",
"bciqjucge6yrzcawqzcljvrpmtwrocecsww6pcjwipzn5j2hfwjof7za"
],
"allowedBuildDeps": "bciqdg64uhkvlkqyc7nli33cja3aolbcdr75qepnrhj5ojlifsvxqzgq"
},
Expand Down Expand Up @@ -430,7 +470,7 @@
}
]
},
"bciqnerbswitlqt27ado74puxt3faxea6jaxe4wvytnzwjpupig25kky": {
"bciqgcwltl3sbuyrqlhxz2spihe2asdzrgt3axosw3mre7ived23syhy": {
"provides": [
{
"ty": "posix.envVar",
Expand All @@ -440,7 +480,7 @@
{
"ty": "posix.envVar",
"key": "RUSTY_V8_MIRROR",
"val": "/home/yohe/ghjk/.dev/rusty_v8"
"val": "/var/home/asdf/repos/ecma/ghjk/.dev/rusty_v8"
},
{
"ty": "ghjk.ports.InstallSetRef",
Expand All @@ -453,62 +493,13 @@
"envsNamed": {
"main": "bciqfnku2tswsz4gapwhys5ox5uiyzcb5r7bmuwzljjeziljcu7efroi",
"_rust": "bciqex5g2cetqvfipwhu6fb3mmyke3y6jvrscjrykf2zl7wfwupiqhca",
"dev": "bciqnerbswitlqt27ado74puxt3faxea6jaxe4wvytnzwjpupig25kky"
"ci": "bciqex5g2cetqvfipwhu6fb3mmyke3y6jvrscjrykf2zl7wfwupiqhca",
"dev": "bciqgcwltl3sbuyrqlhxz2spihe2asdzrgt3axosw3mre7ived23syhy"
}
}
}
],
"blackboard": {
"bciqjucge6yrzcawqzcljvrpmtwrocecsww6pcjwipzn5j2hfwjof7za": {
"buildDepConfigs": {
"asdf_plugin_git": {
"pluginRepo": "https://github.com/lsanwick/asdf-jq",
"portRef": "[email protected]"
}
},
"resolutionDepConfigs": {
"asdf_plugin_git": {
"pluginRepo": "https://github.com/lsanwick/asdf-jq",
"portRef": "[email protected]"
}
},
"port": {
"ty": "denoWorker@v1",
"name": "asdf",
"platforms": [
"x86_64-linux",
"aarch64-linux",
"x86_64-darwin",
"aarch64-darwin"
],
"version": "0.1.0",
"buildDeps": [
{
"name": "curl_aa"
},
{
"name": "git_aa"
},
{
"name": "asdf_plugin_git"
}
],
"resolutionDeps": [
{
"name": "curl_aa"
},
{
"name": "git_aa"
},
{
"name": "asdf_plugin_git"
}
],
"moduleSpecifier": "file:///ports/asdf.ts"
},
"pluginRepo": "https://github.com/lsanwick/asdf-jq",
"installType": "version"
},
"bciqe72molvtvcuj3tuh47ziue2oqd6t4qetxn3rsoa764ofup6uwjmi": {
"port": {
"ty": "denoWorker@v1",
Expand Down Expand Up @@ -610,6 +601,56 @@
"moduleSpecifier": "file:///ports/deno_ghrel.ts"
}
},
"bciqjucge6yrzcawqzcljvrpmtwrocecsww6pcjwipzn5j2hfwjof7za": {
"buildDepConfigs": {
"asdf_plugin_git": {
"pluginRepo": "https://github.com/lsanwick/asdf-jq",
"portRef": "[email protected]"
}
},
"resolutionDepConfigs": {
"asdf_plugin_git": {
"pluginRepo": "https://github.com/lsanwick/asdf-jq",
"portRef": "[email protected]"
}
},
"port": {
"ty": "denoWorker@v1",
"name": "asdf",
"platforms": [
"x86_64-linux",
"aarch64-linux",
"x86_64-darwin",
"aarch64-darwin"
],
"version": "0.1.0",
"buildDeps": [
{
"name": "curl_aa"
},
{
"name": "git_aa"
},
{
"name": "asdf_plugin_git"
}
],
"resolutionDeps": [
{
"name": "curl_aa"
},
{
"name": "git_aa"
},
{
"name": "asdf_plugin_git"
}
],
"moduleSpecifier": "file:///ports/asdf.ts"
},
"pluginRepo": "https://github.com/lsanwick/asdf-jq",
"installType": "version"
},
"bciqdfarczmlu3r5dkvcdoultfbnuvn6saao55h4fbb3jg72kv6mkr3y": {
"manifest": {
"ty": "denoWorker@v1",
Expand Down Expand Up @@ -1009,6 +1050,25 @@
"rust-src"
]
},
"bciqlmoqot4jk2lb2b34pldr5iiwsfm3biuipzesjkkwmc2n2o6nlw4q": {
"version": "v2.4.0",
"port": {
"ty": "denoWorker@v1",
"name": "mold_ghrel",
"platforms": [
"aarch64-linux",
"x86_64-linux"
],
"version": "0.1.0",
"buildDeps": [
{
"name": "tar_aa"
}
],
"moduleSpecifier": "file:///ports/mold.ts"
},
"replaceLd": true
},
"bciqlfx3mm5hi37g75snjknph6fkniixjhnvyyfxeua7f5z4h7nnqtna": {
"port": {
"ty": "denoWorker@v1",
Expand Down Expand Up @@ -1046,24 +1106,42 @@
},
"crateName": "tokio-console"
},
"bciqlmoqot4jk2lb2b34pldr5iiwsfm3biuipzesjkkwmc2n2o6nlw4q": {
"version": "v2.4.0",
"bciqhsrsmayibhhhcp3jmay4tnrsyhz5od6ngtaazymx3o64xxzbqiha": {
"port": {
"ty": "denoWorker@v1",
"name": "mold_ghrel",
"name": "cargobi_cratesio",
"platforms": [
"x86_64-linux",
"aarch64-linux",
"x86_64-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",
"buildDeps": [
{
"name": "tar_aa"
"name": "cargo_binstall_ghrel"
},
{
"name": "rust_rustup"
}
],
"moduleSpecifier": "file:///ports/mold.ts"
"moduleSpecifier": "file:///ports/cargobi.ts"
},
"replaceLd": true
"crateName": "cargo-bloat"
},
"bciqeie3punk3gz4kcfdk2fxx5bsj5fh3j7bb7z36qmimayhwdsvp7cq": {}
}
Expand Down
2 changes: 2 additions & 0 deletions .github/actionlint.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
runner-labels:
- custom-arm
2 changes: 1 addition & 1 deletion .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ jobs:
# pre commit runs ghjk. We'll always see changes
# to lock.json since GITHUB_TOKEN is different
# in the CI
- run: deno task self envs cook -t lock-sed
- run: deno task ghjk envs cook -t lock-sed
- uses: pre-commit/[email protected]
env:
SKIP: ghjk-resolve
Expand Down
4 changes: 2 additions & 2 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,12 @@ repos:
- id: ghjk-resolve
name: Ghjk resolve
language: system
entry: bash -c 'deno task self p resolve'
entry: bash -c 'deno task ghjk p resolve'
pass_filenames: false
- id: lock-sed
name: Sed lock
language: system
entry: bash -c 'deno task self x lock-sed'
entry: bash -c 'deno task ghjk x lock-sed'
pass_filenames: false
- id: deno-fmt
name: Deno format
Expand Down
10 changes: 3 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ Before anything, make sure the following programs are available on the system.
Install the ghjk cli using the installer scripts like so:

```bash
curl -fsSL https://raw.github.com/metatypedev/ghjk/v0.3.0-rc.1/install.sh | bash
curl -fsSL "https://raw.github.com/metatypedev/ghjk/v0.3.0-rc.1/install.sh" | bash
```

Use the following command to create a starter `ghjk.ts` in your project directory:
Expand All @@ -65,12 +65,8 @@ import { file } from "https://raw.github.com/metatypedev/ghjk/v0.3.0-rc.1/mod.ts
// ports are small programs that install sowtware to your envs
import * as ports from "https://raw.github.com/metatypedev/ghjk/v0.3.0-rc.1/ports/mod.ts";

const ghjk = file({});

// NOTE: `ghjk.ts` files are expected to export this sophon object
// all the functions on the ghjk object are ultimately modifying the 'sophon' proxy
// object exported here.
export const sophon = ghjk.sophon;
// NOTE: `ghjk.ts` files are expected to export this ghjk object
export const ghjk = file({});

// top level `install`s go to the `main` env
ghjk.install(ports.protoc());
Expand Down
2 changes: 1 addition & 1 deletion deno.jsonc
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"tasks": {
"test": "cargo build -p ghjk && deno test --unstable-worker-options --unstable-kv -A tests/*",
"test-doc": "cargo build -p ghjk && deno test --unstable-worker-options --unstable-kv -A --doc **/*.ts",
"self": "cargo run -p ghjk",
"ghjk": "cargo run -p ghjk",
"cache": "deno cache deps/*",
"check": "deno run -A ./tools/check.ts",
"dev": "deno run -A ./tools/dev.ts"
Expand Down
Loading

0 comments on commit 5504688

Please sign in to comment.