Skip to content

Commit efbd019

Browse files
MCJack123MCJack123
committed
Fixed CI
1 parent a71130e commit efbd019

File tree

5 files changed

+51
-10
lines changed

5 files changed

+51
-10
lines changed

‎.github/workflows/main.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ jobs:
150150
- name: Download ROM
151151
run: git clone https://github.com/MCJack123/craftos2-rom "C:\Program Files\CraftOS-PC"
152152
- name: Restore vcpkg cache
153-
uses: lukka/run-vcpkg@v10
153+
uses: lukka/run-vcpkg@v11
154154
with:
155155
vcpkgGitCommitId: baf57686c0ec86cbf2e4c055ea09cee710280cc6
156156
- name: Prepare environment
@@ -231,7 +231,7 @@ jobs:
231231
- name: Download ROM
232232
run: git clone https://github.com/MCJack123/craftos2-rom "C:\Program Files\CraftOS-PC"
233233
- name: Restore vcpkg cache
234-
uses: lukka/run-vcpkg@v10
234+
uses: lukka/run-vcpkg@v11
235235
with:
236236
vcpkgGitCommitId: 1b4a65242adfd65a82b1d1a6f31f1accdfe09af9
237237

‎CraftOS-PC 2.vcxproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -379,7 +379,7 @@
379379
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
380380
<Link>
381381
<AdditionalLibraryDirectories>$(SolutionDir)craftos2-lua\src;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
382-
<AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;lua52d.lib;shlwapi.lib;ws2_32.lib;wldap32.lib;wer.lib;crypt32.lib;normaliz.lib;SDL2maind.lib;iphlpapi.lib;libpng16d.lib;%(AdditionalDependencies)</AdditionalDependencies>
382+
<AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;lua52d.lib;shlwapi.lib;ws2_32.lib;wldap32.lib;wer.lib;crypt32.lib;normaliz.lib;SDL2maind.lib;iphlpapi.lib;libpng16d.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
383383
<SubSystem>Console</SubSystem>
384384
<AdditionalOptions>/VERBOSE:LIB %(AdditionalOptions)</AdditionalOptions>
385385
<Profile>true</Profile>
@@ -433,7 +433,7 @@
433433
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
434434
<Link>
435435
<AdditionalLibraryDirectories>$(SolutionDir)craftos2-lua\src;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
436-
<AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;lua52.lib;shlwapi.lib;ws2_32.lib;wldap32.lib;crypt32.lib;normaliz.lib;SDL2main.lib;iphlpapi.lib;libpng16.lib;%(AdditionalDependencies)</AdditionalDependencies>
436+
<AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;lua52.lib;shlwapi.lib;ws2_32.lib;wldap32.lib;crypt32.lib;normaliz.lib;SDL2main.lib;iphlpapi.lib;libpng16.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
437437
<SubSystem>Windows</SubSystem>
438438
<GenerateDebugInformation>true</GenerateDebugInformation>
439439
</Link>
@@ -485,7 +485,7 @@
485485
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseStandalone|ARM64'">
486486
<Link>
487487
<AdditionalLibraryDirectories>$(SolutionDir)craftos2-lua\src;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
488-
<AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;lua52.lib;shlwapi.lib;ws2_32.lib;wldap32.lib;crypt32.lib;normaliz.lib;SDL2main.lib;iphlpapi.lib;libpng16.lib;%(AdditionalDependencies)</AdditionalDependencies>
488+
<AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;lua52.lib;shlwapi.lib;ws2_32.lib;wldap32.lib;crypt32.lib;normaliz.lib;SDL2main.lib;iphlpapi.lib;libpng16.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
489489
<SubSystem>Windows</SubSystem>
490490
<GenerateDebugInformation>true</GenerateDebugInformation>
491491
</Link>
@@ -537,7 +537,7 @@
537537
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseC|ARM64'">
538538
<Link>
539539
<AdditionalLibraryDirectories>$(SolutionDir)craftos2-lua\src;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
540-
<AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;lua52.lib;sdl2.lib;shlwapi.lib;ws2_32.lib;wldap32.lib;crypt32.lib;normaliz.lib;SDL2main.lib;SDL2_mixer.lib;iphlpapi.lib;libpng16.lib;%(AdditionalDependencies)</AdditionalDependencies>
540+
<AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;lua52.lib;sdl2.lib;shlwapi.lib;ws2_32.lib;wldap32.lib;crypt32.lib;normaliz.lib;SDL2main.lib;SDL2_mixer.lib;iphlpapi.lib;libpng16.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
541541
<SubSystem>Console</SubSystem>
542542
<GenerateDebugInformation>true</GenerateDebugInformation>
543543
</Link>

‎resources/CCT-Test-Bootstrap.lua‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
config.set("abortTimeout", 3000) -- to speed things up a bit
2-
config.set("standardsMode", true)
32
config.add("http_blacklist", "$private")
43
if ... == "debugger" then
54
periphemu.create("left", "debugger")

‎resources/CCT-Tests.patch‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,48 @@ diff -ruN --strip -x .DS_Store projects/core/src/test/resources/test-rom/spec/ap
3535
end)
3636
end)
3737

38+
diff -ruN --strip -x .DS_Store projects/core/src/test/resources/test-rom/spec/apis/os_spec.lua b/projects/core/src/test/resources/test-rom/spec/apis/os_spec.lua
39+
--- a/projects/core/src/test/resources/test-rom/spec/apis/os_spec.lua 2021-06-08 23:52:34.000000000 -0400
40+
+++ b/projects/core/src/test/resources/test-rom/spec/apis/os_spec.lua 2021-04-28 03:19:00.000000000 -0400
41+
@@ -189,38 +189,3 @@
42+
end)
43+
end)
44+
-
45+
- describe("os.queueEvent", function()
46+
- local function roundtrip(...)
47+
- local event_name = ("event_%08x"):format(math.random(1, 0x7FFFFFFF))
48+
- os.queueEvent(event_name, ...)
49+
- return select(2, os.pullEvent(event_name))
50+
- end
51+
-
52+
- it("preserves references in tables", function()
53+
- local tbl = {}
54+
- local xs = roundtrip({ tbl, tbl })
55+
- expect(xs[1]):eq(xs[2])
56+
- end)
57+
-
58+
- it("handles recursive tables", function()
59+
- local tbl = {}
60+
- tbl[1] = tbl
61+
-
62+
- local xs = roundtrip(tbl)
63+
- expect(xs):eq(xs[1])
64+
- end)
65+
-
66+
- it("does not preserve references in separate args", function()
67+
- -- I'm not sure I like this behaviour, but it is what CC has always done.
68+
- local tbl = {}
69+
- local xs, ys = roundtrip(tbl, tbl)
70+
- expect(xs):ne(ys)
71+
- end)
72+
-
73+
- it("clones objects", function()
74+
- local tbl = {}
75+
- local xs = roundtrip(tbl)
76+
- expect(xs):ne(tbl)
77+
- end)
78+
- end)
79+
end)
3880
diff -ruN --strip -x .DS_Store projects/core/src/test/resources/test-rom/spec/apis/textutils_spec.lua b/projects/core/src/test/resources/test-rom/spec/apis/textutils_spec.lua
3981
--- a/projects/core/src/test/resources/test-rom/spec/apis/textutils_spec.lua 2021-06-08 23:52:34.000000000 -0400
4082
+++ b/projects/core/src/test/resources/test-rom/spec/apis/textutils_spec.lua 2021-04-28 03:19:00.000000000 -0400

‎src/apis/fs.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -120,11 +120,11 @@ static std::vector<path_t> fixpath_multiple(Computer *comp, std::string path) {
120120
return retval;
121121
}
122122

123-
static std::string normalizePath(const path_t& basePath) {
123+
static std::string normalizePath(const path_t& basePath, bool allowWildcards = false) {
124124
path_t cleanPath;
125125
for (const auto& p : basePath) {
126126
path_t::string_type str = p.native();
127-
str.erase(std::remove_if(str.begin(), str.end(), [](path_t::string_type::value_type c)->bool {return c == '"' || c == '*' || c == ':' || c == '<' || c == '>' || c == '?' || c == '|' || c < 32;}), str.end());
127+
str.erase(std::remove_if(str.begin(), str.end(), [allowWildcards](path_t::string_type::value_type c)->bool {return c == '"' || (c == '*' && !allowWildcards) || c == ':' || c == '<' || c == '>' || (c == '?' && !allowWildcards) || c == '|' || c < 32;}), str.end());
128128
if (std::regex_match(str, pathregex("^\\.\\.\\.+$"))) cleanPath /= ".";
129129
else cleanPath /= path_t(str);
130130
}
@@ -425,7 +425,7 @@ static int fs_combine(lua_State *L) {
425425
if (str[0] == '/' || str[0] == '\\') str = str.substr(1);
426426
basePath /= str;
427427
}
428-
pushstring(L, normalizePath(basePath));
428+
pushstring(L, normalizePath(basePath, true));
429429
return 1;
430430
}
431431

0 commit comments

Comments
 (0)