Merge pull request #817 from ocaml/always-setup-cygwin

smorimoto · web-flow · commit 9d0228a7cbce · 2024-06-22T21:11:44.000+09:00
Always set-up Cygwin whether or not the cache is hit
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,10 @@ and this project adheres to
 
 ## [unreleased]
 
+### Changed
+
+- Always set-up Cygwin whether or not the cache is hit.
+
 ## [3.0.0-alpha]
 
 ### Added
diff --git a/dist/index.js b/dist/index.js
diff --git a/packages/setup-ocaml/src/installer.ts b/packages/setup-ocaml/src/installer.ts
@@ -63,8 +63,8 @@ export async function installer() {
   }
   const { opamCacheHit, cygwinCacheHit } = await restoreOpamCaches();
   if (PLATFORM === "windows") {
+    await setupCygwin();
     if (!cygwinCacheHit) {
-      await setupCygwin();
       await saveCygwinCache();
     }
     core.addPath(CYGWIN_ROOT_BIN);

Original file line number	Diff line number	Diff line change
`@@ -63,8 +63,8 @@ export async function installer() {`
`63`	`63`	`}`
`64`	`64`	`const { opamCacheHit, cygwinCacheHit } = await restoreOpamCaches();`
`65`	`65`	`if (PLATFORM === "windows") {`
	`66`	`+ await setupCygwin();`
`66`	`67`	`if (!cygwinCacheHit) {`
`67`		`- await setupCygwin();`
`68`	`68`	`await saveCygwinCache();`
`69`	`69`	`}`
`70`	`70`	`core.addPath(CYGWIN_ROOT_BIN);`