Skip to content

Commit 100eb76

Browse files
authored
fix: nightly CI issue (#96)
* fix: nightly CI issue * fix timeout on downloads
1 parent 8d50518 commit 100eb76

File tree

6 files changed

+34
-18
lines changed

6 files changed

+34
-18
lines changed

.ghjk/lock.json

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,14 @@
55
"ports": {
66
"version": "0",
77
"configResolutions": {
8+
"bciqay4m4kmzfduj5t2clgejxgpe5zwper6lyyaxt7rhbjalaqd32nhq": {
9+
"version": "2.34.1",
10+
"buildDepConfigs": {},
11+
"portRef": "[email protected]",
12+
"specifiedVersion": false
13+
},
814
"bciqjlw6cxddajjmznoemlmnu7mgbbm7a3hfmnd2x5oivwajmiqui5ey": {
9-
"version": "v0.2.63",
15+
"version": "v0.2.64",
1016
"buildDepConfigs": {},
1117
"portRef": "[email protected]",
1218
"specifiedVersion": false
@@ -15,16 +21,16 @@
1521
"version": "3.7.1",
1622
"buildDepConfigs": {
1723
"cpy_bs_ghrel": {
18-
"version": "3.12.3",
24+
"version": "3.12.4",
1925
"buildDepConfigs": {
2026
"tar_aa": {
21-
"version": "1.35",
27+
"version": "1.34",
2228
"buildDepConfigs": {},
2329
"portRef": "[email protected]",
2430
"specifiedVersion": false
2531
},
2632
"zstd_aa": {
27-
"version": "v1.5.6,",
33+
"version": "v1.4.8,",
2834
"buildDepConfigs": {},
2935
"portRef": "[email protected]",
3036
"specifiedVersion": false
@@ -39,16 +45,16 @@
3945
"specifiedVersion": false
4046
},
4147
"bciqij3g6mmbjn4a6ps4eipcy2fmw2zumgv5a3gbxycthroffihwquoi": {
42-
"version": "3.12.3",
48+
"version": "3.12.4",
4349
"buildDepConfigs": {
4450
"tar_aa": {
45-
"version": "1.35",
51+
"version": "1.34",
4652
"buildDepConfigs": {},
4753
"portRef": "[email protected]",
4854
"specifiedVersion": false
4955
},
5056
"zstd_aa": {
51-
"version": "v1.5.6,",
57+
"version": "v1.4.8,",
5258
"buildDepConfigs": {},
5359
"portRef": "[email protected]",
5460
"specifiedVersion": false
@@ -58,13 +64,13 @@
5864
"specifiedVersion": false
5965
},
6066
"bciqj4p5hoqweghbuvz52rupja7sqze34z63dd62nz632c5zxikv6ezy": {
61-
"version": "1.35",
67+
"version": "1.34",
6268
"buildDepConfigs": {},
6369
"portRef": "[email protected]",
6470
"specifiedVersion": false
6571
},
6672
"bciqe6fwheayositrdk7rkr2ngdr4wizldakex23tgivss7w6z7g3q3y": {
67-
"version": "v1.5.6,",
73+
"version": "v1.4.8,",
6874
"buildDepConfigs": {},
6975
"portRef": "[email protected]",
7076
"specifiedVersion": false

.github/workflows/nightly.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,6 @@ jobs:
6666
env:
6767
GHJKFILE: ./examples/protoc/ghjk.ts
6868
- run: |
69-
cd examples/protoc
69+
cd examples/tasks
7070
. $(ghjk print share-dir-path)/env.sh
71-
protoc --version
71+
ghjk x hey

ports/cargobi.ts

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ import * as std_ports from "../modules/ports/std.ts";
2222
import {
2323
ghConfValidator,
2424
GithubReleasesInstConf,
25+
readGhVars,
2526
} from "../modules/ports/ghrel.ts";
2627
import rust, { RustInstallConf } from "./rust.ts";
2728

@@ -55,15 +56,17 @@ export type CargobiInstallConf =
5556
export default function conf(config: CargobiInstallConf) {
5657
const { rustConfOverride, ...thisConf } = config;
5758
const out: InstallConfigFat = {
59+
...readGhVars(),
5860
...confValidator.parse(thisConf),
59-
buildDepConfigs: {
61+
port: manifest,
62+
};
63+
if (rustConfOverride) {
64+
out.buildDepConfigs = {
6065
[std_ports.rust_rustup.name]: thinInstallConfig(rust({
61-
profile: "minimal",
6266
...rustConfOverride,
6367
})),
64-
},
65-
port: manifest,
66-
};
68+
};
69+
}
6770
return out;
6871
}
6972

ports/cmake.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import * as ports from "./mod.ts";
2525
*
2626
*/
2727
export default function conf(
28-
config: InstallConfigSimple,
28+
config: InstallConfigSimple = {},
2929
): InstallConfigFat[] {
3030
/*
3131
The universal macOS cmake build downloaded by asdf crashes

ports/rust.ts

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,14 @@ export type RustInstallConf =
7070
& InstallConfigSimple
7171
& zod.input<typeof confValidator>;
7272

73+
/**
74+
* Uses {@link import("./rustup.ts").conf} to install a rust toolchain.
75+
*
76+
* Defaults to the minimal profile installation of
77+
*/
7378
export default function conf(config: RustInstallConf = {}) {
7479
return {
80+
profile: "minimal",
7581
...config,
7682
port: manifest,
7783
};

utils/mod.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ let requestBuilder;
201201
try {
202202
requestBuilder = new dax.RequestBuilder()
203203
.showProgress(Deno.stderr.isTerminal())
204-
.timeout(Deno.env.get("GHJK_REQ_TIMEOUT") as any ?? "1m");
204+
.timeout(Deno.env.get("GHJK_REQ_TIMEOUT") as any ?? "5m");
205205
} catch (err) {
206206
throw new Error(
207207
`invalid timeout param on GHJK_REQ_TIMEOUT: ${
@@ -425,6 +425,7 @@ export async function downloadFile(
425425

426426
await $.request(url)
427427
.header(headers)
428+
.timeout(undefined)
428429
.pipeToPath(tmpFilePath, { create: true, mode });
429430

430431
await $.path(downloadPath).ensureDir();

0 commit comments

Comments
 (0)