From c7678e4a771442389a1a28638b5c0a1554dd0556 Mon Sep 17 00:00:00 2001 From: Tim-Philipp Müller Date: Thu, 24 Aug 2023 09:08:35 +0100 Subject: ci: cache: fix MSYS detection for 1.20 branch We don't support MSYS2 here, so need to check for Windows. --- cerbero/commands/cache.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cerbero/commands/cache.py b/cerbero/commands/cache.py index 41de0f5f..b7b0c4f9 100644 --- a/cerbero/commands/cache.py +++ b/cerbero/commands/cache.py @@ -286,8 +286,8 @@ class UploadCache(BaseCache): # MSYS ssh is very old, and fails to upload to the latest Debian stable # on the artifact server with a cryptic: no hostkey algo # So, let's just use the openssh-client that ships with Windows 10 in - # that case. We continue to use MSYS2 ssh because it's less brain-dead. - if config.distro == Distro.MSYS: + # that case. + if config.platform == Platform.WINDOWS: openssh_dir = pathlib.Path('C:/Windows/System32/OpenSSH') ssh = openssh_dir / 'ssh.exe' scp = openssh_dir / 'scp.exe' @@ -303,7 +303,7 @@ class UploadCache(BaseCache): # click on UI things. The only workaround is to pass it to ssh-agent # over stdin. I have no words to describe how annoying this was to fix. args = [] - if config.distro == Distro.MSYS: + if config.platform == Platform.WINDOWS: cmd = f'''Get-Service ssh-agent | Set-Service -StartupType Manual; Start-Service ssh-agent; Get-Service ssh-agent''' -- cgit v1.2.3