Skip to content

Commit d018be2

Browse files
committed
fix: support unknown phase
1 parent 734e61d commit d018be2

5 files changed

Lines changed: 47 additions & 30 deletions

File tree

packages/clinder-action/dist/main.cjs

Lines changed: 25 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -542,7 +542,7 @@ var require_tunnel = __commonJS({
542542
connectOptions.headers = connectOptions.headers || {};
543543
connectOptions.headers["Proxy-Authorization"] = "Basic " + new Buffer(connectOptions.proxyAuth).toString("base64");
544544
}
545-
debug("making CONNECT request");
545+
debug2("making CONNECT request");
546546
var connectReq = self.request(connectOptions);
547547
connectReq.useChunkedEncodingByDefault = false;
548548
connectReq.once("response", onResponse);
@@ -562,7 +562,7 @@ var require_tunnel = __commonJS({
562562
connectReq.removeAllListeners();
563563
socket.removeAllListeners();
564564
if (res.statusCode !== 200) {
565-
debug(
565+
debug2(
566566
"tunneling socket could not be established, statusCode=%d",
567567
res.statusCode
568568
);
@@ -574,21 +574,21 @@ var require_tunnel = __commonJS({
574574
return;
575575
}
576576
if (head.length > 0) {
577-
debug("got illegal response body from proxy");
577+
debug2("got illegal response body from proxy");
578578
socket.destroy();
579579
var error = new Error("got illegal response body from proxy");
580580
error.code = "ECONNRESET";
581581
options.request.emit("error", error);
582582
self.removeSocket(placeholder);
583583
return;
584584
}
585-
debug("tunneling connection has established");
585+
debug2("tunneling connection has established");
586586
self.sockets[self.sockets.indexOf(placeholder)] = socket;
587587
return cb(socket);
588588
}
589589
function onError(cause) {
590590
connectReq.removeAllListeners();
591-
debug(
591+
debug2(
592592
"tunneling socket could not be established, cause=%s\n",
593593
cause.message,
594594
cause.stack
@@ -650,9 +650,9 @@ var require_tunnel = __commonJS({
650650
}
651651
return target;
652652
}
653-
var debug;
653+
var debug2;
654654
if (process.env.NODE_DEBUG && /\btunnel\b/.test(process.env.NODE_DEBUG)) {
655-
debug = function() {
655+
debug2 = function() {
656656
var args = Array.prototype.slice.call(arguments);
657657
if (typeof args[0] === "string") {
658658
args[0] = "TUNNEL: " + args[0];
@@ -662,10 +662,10 @@ var require_tunnel = __commonJS({
662662
console.error.apply(console, args);
663663
};
664664
} else {
665-
debug = function() {
665+
debug2 = function() {
666666
};
667667
}
668-
exports2.debug = debug;
668+
exports2.debug = debug2;
669669
}
670670
});
671671

@@ -19876,10 +19876,10 @@ Support boolean input list: \`true | True | TRUE | false | False | FALSE\``);
1987619876
return process.env["RUNNER_DEBUG"] === "1";
1987719877
}
1987819878
exports2.isDebug = isDebug;
19879-
function debug(message) {
19879+
function debug2(message) {
1988019880
(0, command_1.issueCommand)("debug", {}, message);
1988119881
}
19882-
exports2.debug = debug;
19882+
exports2.debug = debug2;
1988319883
function error(message, properties = {}) {
1988419884
(0, command_1.issueCommand)("error", (0, utils_1.toCommandProperties)(properties), message instanceof Error ? message.toString() : message);
1988519885
}
@@ -20519,18 +20519,23 @@ async function main() {
2051920519
buildToken
2052020520
});
2052120521
for await (const data of builder.fetch()) {
20522+
if (data.message !== void 0) {
20523+
core.info(data.message.trimEnd());
20524+
}
2052220525
switch (data.phase) {
2052320526
case "building":
2052420527
case "pushing":
2052520528
case "launching":
2052620529
case "waiting":
20527-
case "built":
20528-
core.info(data.message.trimEnd());
20530+
case "fetching":
20531+
case "built": {
2052920532
break;
20530-
case "failed":
20533+
}
20534+
case "failed": {
2053120535
core.setFailed(data.message.trimEnd());
2053220536
process.exit(1);
20533-
case "ready":
20537+
}
20538+
case "ready": {
2053420539
core.setSecret(data.token);
2053520540
core.setOutput("url", data.url);
2053620541
core.setOutput("token", data.token);
@@ -20540,9 +20545,11 @@ async function main() {
2054020545
core.saveState("binder-token", data.token);
2054120546
core.notice(`Started Jupyter Server at ${data.url}`);
2054220547
process.exit(0);
20543-
default:
20544-
core.setFailed(`Unknown phase "${data.phase}" from builder`);
20545-
process.exit(1);
20548+
}
20549+
default: {
20550+
core.debug(`Unknown phase "${data.phase}" from builder`);
20551+
break;
20552+
}
2054620553
}
2054720554
}
2054820555
} catch (err) {

packages/clinder-action/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "clinder-action",
33
"type": "module",
44
"private": true,
5-
"version": "1",
5+
"version": "1.0.1",
66
"main": "main.mjs",
77
"dependencies": {
88
"@actions/core": "^1.11.1",

packages/clinder-action/src/main.mjs

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,18 +25,23 @@ async function main() {
2525

2626
// Iterate over the build logs
2727
for await (const data of builder.fetch()) {
28+
if (data.message !== undefined) {
29+
core.info(data.message.trimEnd());
30+
}
2831
switch (data.phase) {
2932
case "building":
3033
case "pushing":
3134
case "launching":
3235
case "waiting":
33-
case "built":
34-
core.info(data.message.trimEnd());
36+
case "fetching":
37+
case "built": {
3538
break;
36-
case "failed":
39+
}
40+
case "failed": {
3741
core.setFailed(data.message.trimEnd());
3842
process.exit(1);
39-
case "ready":
43+
}
44+
case "ready": {
4045
// Jupyter Server token is also a secret
4146
core.setSecret(data.token);
4247

@@ -54,9 +59,11 @@ async function main() {
5459

5560
core.notice(`Started Jupyter Server at ${data.url}`);
5661
process.exit(0);
57-
default:
58-
core.setFailed(`Unknown phase "${data.phase}" from builder`);
59-
process.exit(1);
62+
}
63+
default: {
64+
core.debug(`Unknown phase "${data.phase}" from builder`);
65+
break;
66+
}
6067
}
6168
}
6269
// Do stuff

packages/clinder/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "clinder",
33
"type": "module",
4-
"version": "0.1.1",
4+
"version": "0.1.2",
55
"bin": {
66
"clinder": "dist/main.cjs"
77
},

packages/clinder/src/main.mjs

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,16 @@ async function startSession(hub, options) {
3434

3535
// Iterate over the build logs
3636
for await (const data of builder.fetch()) {
37+
if (data.message !== undefined) {
38+
log(data.message.trimEnd());
39+
}
3740
switch (data.phase) {
3841
case "building":
3942
case "pushing":
4043
case "launching":
4144
case "waiting":
45+
case "fetching":
4246
case "built":
43-
log(data.message.trimEnd());
4447
break;
4548
case "ready":
4649
// Output to stdout
@@ -62,8 +65,8 @@ async function startSession(hub, options) {
6265
process.exit(1);
6366

6467
default:
65-
logError(`Unknown phase "${data.phase}" from builder`);
66-
process.exit(2);
68+
log(`Unknown phase "${data.phase}" from builder`);
69+
break;
6770
}
6871
}
6972
}

0 commit comments

Comments
 (0)