_

Signed-off-by: Sora Morimoto <[email protected]>
ocaml · Jun 12, 2024 · 8beca9f · 8beca9f
1 parent cd0384a
commit 8beca9f
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 15 deletions.
diff --git a/dist/index.js b/dist/index.js
diff --git a/dist/post/index.js b/dist/post/index.js
diff --git a/packages/setup-ocaml/src/cache.ts b/packages/setup-ocaml/src/cache.ts
@@ -11,10 +11,12 @@ import {
   ARCHITECTURE,
   CACHE_PREFIX,
   CYGWIN_MIRROR,
+  GITHUB_WORKSPACE,
   OCAML_COMPILER,
   OPAM_DISABLE_SANDBOXING,
   OPAM_ROOT_UNIX,
   OPAM_ROOT_WINDOWS,
+  OPAM_SWITCH,
   PLATFORM,
 } from "./constants.js";
 import { getLatestOpamRelease } from "./opam.js";
@@ -75,13 +77,12 @@ async function composeOpamCacheKeys() {
 
 function composeCygwinCachePaths() {
   const paths = [];
-  const githubWorkspace = process.env.GITHUB_WORKSPACE ?? process.cwd();
   const cygwinRoot = path.join("D:", "cygwin");
   paths.push(cygwinRoot);
   const cygwinRootSymlinkPath = path.posix.join("/cygdrive", "d", "cygwin");
   paths.push(cygwinRootSymlinkPath);
   const cygwinEncodedUri = encodeURIComponent(CYGWIN_MIRROR).toLowerCase();
-  const cygwinPackageRoot = path.join(githubWorkspace, cygwinEncodedUri);
+  const cygwinPackageRoot = path.join(GITHUB_WORKSPACE, cygwinEncodedUri);
   paths.push(cygwinPackageRoot);
   return paths;
 }
@@ -121,9 +122,7 @@ function composeOpamCachePaths() {
   } else {
     paths.push(OPAM_ROOT_UNIX);
   }
-  const githubWorkspace = process.env.GITHUB_WORKSPACE ?? process.cwd();
-  const opamLocalCachePath = path.join(githubWorkspace, "_opam");
-  paths.push(opamLocalCachePath);
+  paths.push(OPAM_SWITCH);
   return paths;
 }
 

diff --git a/packages/setup-ocaml/src/constants.ts b/packages/setup-ocaml/src/constants.ts
@@ -38,10 +38,14 @@ export const CYGWIN_MIRROR = "https://cygwin.mirror.constant.com/";
 
 export const CYGWIN_ROOT = path.join("D:", "cygwin");
 
+export const GITHUB_WORKSPACE = process.env.GITHUB_WORKSPACE ?? process.cwd();
+
 export const OPAM_ROOT_UNIX = path.join(os.homedir(), ".opam");
 
 export const OPAM_ROOT_WINDOWS = path.join("D:", ".opam");
 
+export const OPAM_SWITCH = path.join(GITHUB_WORKSPACE, "_opam");
+
 export const ALLOW_PRERELEASE_OPAM = core.getBooleanInput(
   "allow-prerelease-opam",
   {

diff --git a/packages/setup-ocaml/src/installer.ts b/packages/setup-ocaml/src/installer.ts
@@ -16,6 +16,7 @@ import {
   OPAM_REPOSITORIES,
   OPAM_ROOT_UNIX,
   OPAM_ROOT_WINDOWS,
+  OPAM_SWITCH,
   PLATFORM,
 } from "./constants.js";
 import { installDune } from "./dune.js";
@@ -40,6 +41,7 @@ export async function installer() {
   core.exportVariable("OPAMERRLOGLEN", 0);
   core.exportVariable("OPAMPRECISETRACKING", 1);
   core.exportVariable("OPAMROOT", OPAM_ROOT_UNIX);
+  core.exportVariable("OPAMSWITCH", OPAM_SWITCH);
   core.exportVariable("OPAMYES", 1);
   if (PLATFORM === "windows") {
     core.exportVariable("CYGWIN", "winsymlinks:native");