From db28930e658f3f9378829f8f5d2a1af2b5f87ad0 Mon Sep 17 00:00:00 2001 From: Hongbo Zhang Date: Thu, 8 Oct 2020 19:52:00 +0800 Subject: [PATCH 1/3] allow weird chars in paths --- ninja | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ninja b/ninja index 465289dd33..298369d07a 160000 --- a/ninja +++ b/ninja @@ -1 +1 @@ -Subproject commit 465289dd334c20d871c87badba7058bebe218bc1 +Subproject commit 298369d07ad7cd55a7e92a3bd6876a141c4e608b From cb7cad48f45170aa8e4757a916db4aefe9c76428 Mon Sep 17 00:00:00 2001 From: Hongbo Zhang Date: Thu, 8 Oct 2020 19:59:34 +0800 Subject: [PATCH 2/3] trigger CI failures --- jscomp/build_tests/weird_names/input.js | 7 +++++-- jscomp/build_tests/weird_names/src/404.res | 1 + jscomp/build_tests/weird_names/src/[...params].res | 1 + jscomp/build_tests/weird_names/src/[...params_max_3].res | 1 + jscomp/build_tests/weird_names/src/[[...params]].res | 1 + jscomp/build_tests/weird_names/src/[slug_or_ID].res | 1 + jscomp/build_tests/weird_names/src/_app.res | 1 + 7 files changed, 11 insertions(+), 2 deletions(-) diff --git a/jscomp/build_tests/weird_names/input.js b/jscomp/build_tests/weird_names/input.js index 1f304c742f..c2b3f9a1cb 100644 --- a/jscomp/build_tests/weird_names/input.js +++ b/jscomp/build_tests/weird_names/input.js @@ -5,7 +5,10 @@ var path = require("path"); var out = cp.spawnSync(`bsb`, { encoding: "utf8" }); console.log(out.stdout); -assert.ok(out.stderr === ""); +if(out.stderr !== ""){ + assert.fail(out.stderr) +} + let files = [ "_app.res", @@ -20,5 +23,5 @@ for (let f of files) { let { name } = path.parse(f); let m = `./lib/js/src/${name}.js`; // console.log(m); - assert.deepEqual(require(m), { a: 1 }); + assert.deepEqual(require(m).a, 1); } diff --git a/jscomp/build_tests/weird_names/src/404.res b/jscomp/build_tests/weird_names/src/404.res index 067c6699cf..c311b2ea80 100644 --- a/jscomp/build_tests/weird_names/src/404.res +++ b/jscomp/build_tests/weird_names/src/404.res @@ -1 +1,2 @@ +module A = Demo let a = 1 \ No newline at end of file diff --git a/jscomp/build_tests/weird_names/src/[...params].res b/jscomp/build_tests/weird_names/src/[...params].res index 067c6699cf..c311b2ea80 100644 --- a/jscomp/build_tests/weird_names/src/[...params].res +++ b/jscomp/build_tests/weird_names/src/[...params].res @@ -1 +1,2 @@ +module A = Demo let a = 1 \ No newline at end of file diff --git a/jscomp/build_tests/weird_names/src/[...params_max_3].res b/jscomp/build_tests/weird_names/src/[...params_max_3].res index 067c6699cf..c311b2ea80 100644 --- a/jscomp/build_tests/weird_names/src/[...params_max_3].res +++ b/jscomp/build_tests/weird_names/src/[...params_max_3].res @@ -1 +1,2 @@ +module A = Demo let a = 1 \ No newline at end of file diff --git a/jscomp/build_tests/weird_names/src/[[...params]].res b/jscomp/build_tests/weird_names/src/[[...params]].res index 067c6699cf..c311b2ea80 100644 --- a/jscomp/build_tests/weird_names/src/[[...params]].res +++ b/jscomp/build_tests/weird_names/src/[[...params]].res @@ -1 +1,2 @@ +module A = Demo let a = 1 \ No newline at end of file diff --git a/jscomp/build_tests/weird_names/src/[slug_or_ID].res b/jscomp/build_tests/weird_names/src/[slug_or_ID].res index 067c6699cf..c311b2ea80 100644 --- a/jscomp/build_tests/weird_names/src/[slug_or_ID].res +++ b/jscomp/build_tests/weird_names/src/[slug_or_ID].res @@ -1 +1,2 @@ +module A = Demo let a = 1 \ No newline at end of file diff --git a/jscomp/build_tests/weird_names/src/_app.res b/jscomp/build_tests/weird_names/src/_app.res index 067c6699cf..c311b2ea80 100644 --- a/jscomp/build_tests/weird_names/src/_app.res +++ b/jscomp/build_tests/weird_names/src/_app.res @@ -1 +1,2 @@ +module A = Demo let a = 1 \ No newline at end of file From 84b733d790557eb33965e1144b50c0e230b10ef4 Mon Sep 17 00:00:00 2001 From: Hongbo Zhang Date: Thu, 8 Oct 2020 13:02:47 +0100 Subject: [PATCH 3/3] fix CI failure --- linux/ninja.exe | Bin 171064 -> 171064 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/linux/ninja.exe b/linux/ninja.exe index 38bd4bdf5a8c9cbcb08cc01c692fa76d5d02c217..dc4091b410e301ec9f28760e87ed8f556c94c624 100755 GIT binary patch delta 53 zcmV-50LuTkxC*$q3b2F%6i>F71yPz7VkABNFpUIv7lQAaUsG=rD|hnNBZx0nI~<0}II LfB?6CE&{r3H?|Y2