Try to adapt to GitHub test

shmuz · Dec 8, 2024 · a44c0d1 · a44c0d1
1 parent d0f0073
commit a44c0d1
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git a/.github/workflows/artifacts.yml b/.github/workflows/artifacts.yml
@@ -16,7 +16,7 @@ jobs:
         include:
           - dependencies: "-minimal"
           - dependencies: ""
-            options: "-DPYTHON=yes"
+            options: "-DPYTHON=yes -DGITHUB_TEST=yes"
 
     steps:
     - uses: actions/checkout@v2

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -148,6 +148,10 @@ if(NOT GAWK)
   message(FATAL_ERROR "${ColorRed}gawk not found - please install it${ColorNormal}")
 endif ()
 
+if(${GITHUB_TEST})
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DNO_CONSOLE_TWEAKS")
+endif()
+
 if("${ICU_MODE}" STREQUAL "runtime")
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DRUNTIME_ICU")
     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DRUNTIME_ICU")

diff --git a/far/src/cfg/config.cpp b/far/src/cfg/config.cpp
@@ -59,6 +59,7 @@ int &Confirmation::ExitEffective()
 
 static DWORD ApplyConsoleTweaks()
 {
+#if !defined NO_CONSOLE_TWEAKS // for GitHub test to not hang
 	DWORD64 tweaks = 0;
 	if (Opt.ExclusiveCtrlLeft)
 		tweaks|= EXCLUSIVE_CTRL_LEFT;
@@ -79,6 +80,9 @@ static DWORD ApplyConsoleTweaks()
 	if (Opt.TTYPaletteOverride)
 		tweaks|= CONSOLE_TTY_PALETTE_OVERRIDE;
 	return WINPORT(SetConsoleTweaks)(tweaks);
+#else
+	return 0;
+#endif
 }
 
 static void ApplySudoConfiguration()