Skip to content

Fix Windows CI #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jviotti merged 1 commit into from
Jan 9, 2026
Merged

Fix Windows CI #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .gitattributes
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,6 @@
* text=auto
*.cc text eol=lf
*.h text eol=lf
*.json text eol=lf
*.ts text eol=lf
/vendor/** linguist-generated=true
9 changes: 9 additions & 0 deletions src/generator/include/sourcemeta/codegen/generator_typescript.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,18 @@ class SOURCEMETA_CODEGEN_GENERATOR_EXPORT TypeScript {
auto operator()(const IRUnion &entry) const -> void;

private:
// Exporting symbols that depends on the standard C++ library is considered
// safe.
// https://learn.microsoft.com/en-us/cpp/error-messages/compiler-warnings/compiler-warning-level-2-c4275?view=msvc-170&redirectedfrom=MSDN
#if defined(_MSC_VER)
#pragma warning(disable : 4251)
#endif
// NOLINTNEXTLINE(cppcoreguidelines-avoid-const-or-ref-data-members)
std::ostream &output;
std::string_view prefix;
#if defined(_MSC_VER)
#pragma warning(default : 4251)
#endif
};

} // namespace sourcemeta::codegen
Expand Down
9 changes: 7 additions & 2 deletions test/e2e/typescript/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,12 @@ target_link_libraries(sourcemeta_codegen_e2e_typescript_unit
target_compile_definitions(sourcemeta_codegen_e2e_typescript_unit
PRIVATE E2E_TYPESCRIPT_PATH="${CMAKE_CURRENT_SOURCE_DIR}")

if(WIN32)
set(TSC_BIN "${PROJECT_SOURCE_DIR}/node_modules/.bin/tsc.cmd")
else()
set(TSC_BIN "${PROJECT_SOURCE_DIR}/node_modules/.bin/tsc")
endif()

set(E2E_SCHEMAS "")
file(GLOB TYPESCRIPT_DIALECT_DIRECTORIES "${CMAKE_CURRENT_SOURCE_DIR}/*")
foreach(DIALECT_DIRECTORY ${TYPESCRIPT_DIALECT_DIRECTORIES})
Expand All @@ -20,8 +26,7 @@ foreach(DIALECT_DIRECTORY ${TYPESCRIPT_DIALECT_DIRECTORIES})
get_filename_component(CASE_NAME ${CASE_DIRECTORY} NAME)
list(APPEND E2E_SCHEMAS "${CASE_DIRECTORY}/schema.json")
add_test(NAME "e2e.typescript.tsc.${DIALECT_NAME}.${CASE_NAME}/expected.d.ts"
COMMAND "${PROJECT_SOURCE_DIR}/node_modules/.bin/tsc" --noEmit
"${CASE_DIRECTORY}/expected.d.ts")
COMMAND "${TSC_BIN}" --noEmit "${CASE_DIRECTORY}/expected.d.ts")
endif()
endforeach()
endif()
Expand Down