Skip to content

Commit

Permalink
[API] TypeScript transformation - Part VI - Enable Windows Tests
Browse files Browse the repository at this point in the history
  • Loading branch information
ThuF committed Aug 29, 2024
1 parent ef3478b commit 032c8f4
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 8 deletions.
3 changes: 1 addition & 2 deletions .github/workflows/pull-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,7 @@ jobs:
runs-on: ${{ matrix.os }}-latest
strategy:
matrix:
os: [ubuntu]
# os: [ubuntu, windows]
os: [ubuntu, windows]
steps:
- uses: actions/checkout@v4
with:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Component;

import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.nio.charset.StandardCharsets;
Expand Down Expand Up @@ -171,13 +171,13 @@ protected byte[] tryGetFromClassLoader(String repositoryAwareFilePathString, Str
* @return the string
*/
protected String createLookupPath(String filePathString) {
if (filePathString.startsWith("/webjars")) {
return "/META-INF/resources" + filePathString;
if (filePathString.startsWith(File.separator + "webjars")) {
return File.separator + "META-INF" + File.separator + "resources" + filePathString;
} else if (filePathString.startsWith("webjars")) {
return "/META-INF/resources/" + filePathString;
return File.separator + "META-INF" + File.separator + "resources" + File.separator + filePathString;
}

return "/META-INF/dirigible/" + filePathString;
return File.separator + "META-INF" + File.separator + "dirigible" + File.separator + filePathString;
}

/**
Expand All @@ -188,7 +188,7 @@ protected String createLookupPath(String filePathString) {
* @return the path
*/
public Path unpackedToFileSystem(Path pathToUnpack, Path pathToLookup) {
String path = "/META-INF/dirigible/" + pathToLookup.toString();
String path = File.separator + "META-INF" + File.separator + "dirigible" + File.separator + pathToLookup.toString();
try (InputStream bundled = this.getClass()
.getResourceAsStream(path)) {
Files.createDirectories(pathToUnpack.getParent());
Expand Down

0 comments on commit 032c8f4

Please sign in to comment.