CI: some tweaks [ran: extracted generic bits from Windows commit.] Signed-off-by: Ran Benita <ran@unusedvar.com>