Skip to content

Commit 5889e22

Browse files
NatoandroNatoandro
committed
fix pthon version in ghjk
1 parent fb6d50e commit 5889e22

File tree

3 files changed

+84
-30
lines changed

3 files changed

+84
-30
lines changed

‎.ghjk/deno.lock

Lines changed: 2 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.ghjk/lock.json

Lines changed: 65 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"version": "0",
3-
"platform": "aarch64-darwin",
3+
"platform": "x86_64-linux",
44
"moduleEntries": {
55
"ports": {
66
"version": "0",
@@ -409,6 +409,23 @@
409409
"portRef": "[email protected]",
410410
"crateName": "whiz",
411411
"locked": true
412+
},
413+
"46fdcefe10dc796143f7a41313e9359f1a8cf62791dfaa8994e26f21adb151ca": {
414+
"version": "3.8.18",
415+
"depConfigs": {
416+
"tar_aa": {
417+
"version": "1.35",
418+
"depConfigs": {},
419+
"portRef": "[email protected]"
420+
},
421+
"zstd_aa": {
422+
"version": "v1.5.5,",
423+
"depConfigs": {},
424+
"portRef": "[email protected]"
425+
}
426+
},
427+
"portRef": "[email protected]",
428+
"releaseTag": "20240224"
412429
}
413430
}
414431
},
@@ -434,7 +451,8 @@
434451
"dd83a99f49f3f0fba11cdd014ff718cc9539316b",
435452
"4d1916871a40b6ac730709f7721f740df192c84d",
436453
"4df902463d60efc5b8e760ea4899f6ab6df0f16e",
437-
"40d9babcd5c8e79379e58dbc2f2a967ef68fbb09",
454+
"88f6aa5ddb513712623d31a17096ea26286064da",
455+
"185be72d02330f9b3dfa3d0791274feb958e119d",
438456
"5549508f1f5eddf9cb2465f07cf0c7603dc0c849",
439457
"5c041a4209ae50657ea5acacc26683688f2913a9",
440458
"d0bcae26fcc8ca53ffbdb66de5735c608858a313",
@@ -451,8 +469,8 @@
451469
"cargo_binstall_ghrel": "c8084cf4c423d1862a1d783c70b8221c0cf9d73c",
452470
"pnpm_ghrel": "422c26d0e74744b87f0f6f0eefa25e54a1188e08",
453471
"asdf_plugin_git": "f77828fcb8896a0df3511920d0055d0f89bfdec9",
454-
"node_org": "61d8e9cfc48284f60358b8c0e717e58c1da60176",
455-
"cpy_bs_ghrel": "2048e8e42478e9e6d803d7c7559bedaf976a51b5"
472+
"cpy_bs_ghrel": "ff0a30a4efc90a6a49611e273e167ac3d3444441",
473+
"node_org": "601d3ac573271b2e2fb3c453ccd54f22d151c64e"
456474
}
457475
}
458476
},
@@ -848,7 +866,26 @@
848866
},
849867
"packageName": "node-gyp"
850868
},
851-
"40d9babcd5c8e79379e58dbc2f2a967ef68fbb09": {
869+
"88f6aa5ddb513712623d31a17096ea26286064da": {
870+
"version": "v2.4.0",
871+
"port": {
872+
"ty": "denoWorker@v1",
873+
"name": "mold_ghrel",
874+
"platforms": [
875+
"aarch64-linux",
876+
"x86_64-linux"
877+
],
878+
"version": "0.1.0",
879+
"deps": [
880+
{
881+
"name": "tar_aa"
882+
}
883+
],
884+
"moduleSpecifier": "https://raw.githubusercontent.com/metatypedev/ghjk/423d38e/ports/mold.ts"
885+
},
886+
"replaceLd": false
887+
},
888+
"185be72d02330f9b3dfa3d0791274feb958e119d": {
852889
"version": "3.8.18",
853890
"port": {
854891
"ty": "denoWorker@v1",
@@ -871,7 +908,8 @@
871908
}
872909
],
873910
"moduleSpecifier": "https://raw.githubusercontent.com/metatypedev/ghjk/423d38e/ports/cpy_bs.ts"
874-
}
911+
},
912+
"releaseTag": "20240224"
875913
},
876914
"5549508f1f5eddf9cb2465f07cf0c7603dc0c849": {
877915
"version": "1.7.0",
@@ -1266,55 +1304,57 @@
12661304
"portRef": "[email protected]"
12671305
}
12681306
},
1269-
"61d8e9cfc48284f60358b8c0e717e58c1da60176": {
1307+
"ff0a30a4efc90a6a49611e273e167ac3d3444441": {
12701308
"manifest": {
12711309
"ty": "denoWorker@v1",
1272-
"name": "node_org",
1310+
"name": "cpy_bs_ghrel",
12731311
"platforms": [
1274-
"aarch64-linux",
12751312
"x86_64-linux",
1276-
"aarch64-darwin",
1313+
"aarch64-linux",
12771314
"x86_64-darwin",
1278-
"aarch64-windows",
1279-
"x86_64-windows"
1315+
"aarch64-darwin",
1316+
"x86_64-windows",
1317+
"aarch64-windows"
12801318
],
12811319
"version": "0.1.0",
12821320
"deps": [
12831321
{
12841322
"name": "tar_aa"
1323+
},
1324+
{
1325+
"name": "zstd_aa"
12851326
}
12861327
],
1287-
"moduleSpecifier": "https://raw.githubusercontent.com/metatypedev/ghjk/423d38e/ports/node.ts"
1328+
"moduleSpecifier": "https://raw.githubusercontent.com/metatypedev/ghjk/423d38e/ports/cpy_bs.ts"
12881329
},
12891330
"defaultInst": {
1290-
"portRef": "[email protected]"
1331+
"portRef": "[email protected]",
1332+
"releaseTag": "20240224"
12911333
}
12921334
},
1293-
"2048e8e42478e9e6d803d7c7559bedaf976a51b5": {
1335+
"601d3ac573271b2e2fb3c453ccd54f22d151c64e": {
12941336
"manifest": {
12951337
"ty": "denoWorker@v1",
1296-
"name": "cpy_bs_ghrel",
1338+
"name": "node_org",
12971339
"platforms": [
1298-
"x86_64-linux",
12991340
"aarch64-linux",
1300-
"x86_64-darwin",
1341+
"x86_64-linux",
13011342
"aarch64-darwin",
1302-
"x86_64-windows",
1303-
"aarch64-windows"
1343+
"x86_64-darwin",
1344+
"aarch64-windows",
1345+
"x86_64-windows"
13041346
],
13051347
"version": "0.1.0",
13061348
"deps": [
13071349
{
13081350
"name": "tar_aa"
1309-
},
1310-
{
1311-
"name": "zstd_aa"
13121351
}
13131352
],
1314-
"moduleSpecifier": "https://raw.githubusercontent.com/metatypedev/ghjk/423d38e/ports/cpy_bs.ts"
1353+
"moduleSpecifier": "https://raw.githubusercontent.com/metatypedev/ghjk/423d38e/ports/node.ts"
13151354
},
13161355
"defaultInst": {
1317-
"portRef": "[email protected]"
1356+
"version": "20.8.0",
1357+
"portRef": "[email protected]"
13181358
}
13191359
}
13201360
}

‎ghjk.ts

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
export { ghjk } from "https://raw.github.com/metatypedev/ghjk/423d38e/mod.ts";
22
import * as ghjk from "https://raw.github.com/metatypedev/ghjk/423d38e/mod.ts";
3+
import { thinInstallConfig } from "https://raw.github.com/metatypedev/ghjk/423d38e/utils/mod.ts";
34
import * as ports from "https://raw.github.com/metatypedev/ghjk/423d38e/ports/mod.ts";
45

56
const PROTOC_VERSION = "v24.1";
@@ -17,6 +18,12 @@ const NODE_VERSION = "20.8.0";
1718
const TEMPORAL_VERSION = "0.10.7";
1819
const METATYPE_VERSION = "0.3.7-0";
1920

21+
const installs = {
22+
python: ports.cpy_bs({ version: PYTHON_VERSION, releaseTag: "20240224" }),
23+
python_latest: ports.cpy_bs({ releaseTag: "20240224" }),
24+
node: ports.node({ version: NODE_VERSION }),
25+
};
26+
2027
ghjk.install(
2128
ports.wasmedge({ version: WASMEDGE_VERSION }),
2229
ports.protoc({ version: PROTOC_VERSION }),
@@ -48,7 +55,7 @@ if (!Deno.env.has("OCI")) {
4855
version: CARGO_INSTA_VERSION,
4956
locked: true,
5057
}),
51-
ports.node({ version: NODE_VERSION }),
58+
installs.node,
5259
ports.pnpm({ version: PNPM_VERSION }),
5360
// FIXME: jco installs node as a dep
5461
ports.npmi({
@@ -70,13 +77,13 @@ if (Deno.build.os == "linux" && !Deno.env.has("NO_MOLD")) {
7077

7178
if (!Deno.env.has("NO_PYTHON")) {
7279
ghjk.install(
73-
ports.cpy_bs({ version: PYTHON_VERSION }),
80+
installs.python,
7481
ports.pipi({
7582
packageName: "poetry",
7683
version: POETRY_VERSION,
7784
})[0],
7885
);
79-
if (!Deno.env.has("CI") && !Deno.env.has("OCI")) {
86+
if (!Deno.env.has("OCI")) {
8087
ghjk.install(
8188
ports.pipi({ packageName: "pre-commit" })[0],
8289
);
@@ -105,5 +112,11 @@ ghjk.task("clean-deno-lock", {
105112
});
106113

107114
export const secureConfig = ghjk.secureConfig({
108-
allowedPortDeps: [...ghjk.stdDeps({ enableRuntimes: true })],
115+
allowedPortDeps: [
116+
...ghjk.stdDeps(),
117+
...[installs.python_latest, installs.node].map((fat) => ({
118+
manifest: fat.port,
119+
defaultInst: thinInstallConfig(fat),
120+
})),
121+
],
109122
});

0 commit comments

Comments
 (0)