ci: stick with Windows 2022 until we resolve Windows 2025 issues

Signed-off-by: Jafar Al-Gharaibeh <[email protected]>
uniconproject · Feb 3, 2025 · d96c226 · d96c226
1 parent a4056ac
commit d96c226
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -26,7 +26,7 @@ jobs:
     strategy:
       matrix:
         cfg:
-        -  { os: windows-latest,  name: 'Windows 64-bit', pkg: 'Windows_64-bit',  opt: '--enable-werror' }
+        -  { os: windows-2022,  name: 'Windows 64-bit', pkg: 'Windows_64-bit',  opt: '--enable-werror' }
         #-  { os: windows-latest,  name: 'Windows 32-bit', opt: '--build=i686-w64-mingw32 --host=i686-w64-mingw32' }
 
     defaults:

diff --git a/.github/workflows/packages.yml b/.github/workflows/packages.yml
@@ -13,7 +13,7 @@ jobs:
     strategy:
       matrix:
         cfg:
-        -  { os: windows-latest,  name: 'Windows_64-bit',  opt: '' }
+        -  { os: windows-2022,  name: 'Windows_64-bit',  opt: '' }
         #-  { os: windows-latest,  name: 'Windows_32-bit', opt: '--build=i686-w64-mingw32 --host=i686-w64-mingw32' }
 
     defaults:

diff --git a/src/runtime/Makefile b/src/runtime/Makefile
@@ -54,7 +54,7 @@ CONSOLEOBJS=  xrwindow.$(O) xrsys.$(O) xinit.$(O) xfwindow.$(O) xfsys.$(O) xrwin
 
 OBJS=	$(XOBJS) $(EXEICONTARGET)
 
-interp_all: update_rev 
+interp_all: update_rev
 	$(MAKE) $(UNICONX)
 
 # Some systems require global symbols to be left in iconx for loadfunc() to work
@@ -95,7 +95,7 @@ WNTCON: CONSOLE icon.$(O)
 
 # make sure to clean the files affected by NTConsole to force rebuild them
 CONSOLE:
-	$(RM) $(CONSOLEOBJS)	
+	$(RM) $(CONSOLEOBJS)
 
 
 x%.$(O): %.r $(HDRS)
@@ -148,9 +148,11 @@ comp_all comp_all_uniconc: update_rev
 	@echo "   [ICONC] This might take a while..."
 	$(MAKE) rt.a
 
+FOFILES=f_*.$(O) o_*$(O)
+
 rt.a: ../../rt/lib/libucommon.a ../../rt/lib/libgdbm.a ../../rt/lib/libtp.a ../../rt/lib/libuconsole.a $(COBJS)
 	$(CMNT) @echo [ICONC RTT] "-A -O ... # rt.a: "
-	$(RTT) $(DASHS) -A -O  "$(COBJS) f_*.$(O) o_*$(O)"
+	$(RTT) $(DASHS) -A -O  "$(COBJS) $(FOFILES)"
 	$(RANLIB) $@
 	$(CP) rt.a ../common/dlrgint.$(O) ../../rt/lib/
 	$(CP) rt.db ../../rt/lib/