From a048c7b458e35970114684a13ba885e3878869e7 Mon Sep 17 00:00:00 2001
From: Jonah Beckford <9566106-jonahbeckford@users.noreply.gitlab.com>
Date: Mon, 26 Aug 2024 15:21:14 -0700
Subject: [PATCH] win32: Install zip

---
 .github/setup-dkml.cmd | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/.github/setup-dkml.cmd b/.github/setup-dkml.cmd
index d5a23c5d0e6..7016323697c 100644
--- a/.github/setup-dkml.cmd
+++ b/.github/setup-dkml.cmd
@@ -30,7 +30,7 @@ if %ERRORLEVEL% neq 0 (
 	exit /b 1
 )
 
-REM Install DkML compiler
+REM Install DkML compiler including MSYS2
 :HavePowershellExe
 SET OPAMYES=1
 REM     TODO: Use [dkml-workflows] not [dkml-workflows-prerelease] once 2.1.2 is merged
@@ -40,4 +40,9 @@ if NOT EXIST dkml-workflows (
 IF NOT EXIST .ci\o\dkml\bin\ocamlc.exe (
     "%INTERNAL_POWERSHELLEXE%" -NoProfile -ExecutionPolicy Bypass -Command "& dkml-workflows\test\pc\setup-dkml-windows_x86_64.ps1; exit $LASTEXITCODE"
 )
+
+REM Install MSYS2's zip.exe so `make package` works
+if NOT EXIST msys64\usr\bin\zip.exe (
+    msys64\usr\bin\pacman -Sy --noconfirm --needed zip
+)
 exit /b %ERRORLEVEL%