Set igncr using BASH_ENV instead of SHELLOPTS

ocaml · Jan 8, 2025 · 28ddebe · 28ddebe
1 parent c847188
commit 28ddebe
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 4 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/constants.ts b/packages/setup-ocaml/src/constants.ts
@@ -64,6 +64,8 @@ export const CYGWIN_ROOT = path.join("D:", "cygwin");
 
 export const CYGWIN_ROOT_BIN = path.join(CYGWIN_ROOT, "bin");
 
+export const CYGWIN_BASH_ENV = path.join(CYGWIN_ROOT, "bash_env");
+
 export const DUNE_CACHE_ROOT = (() => {
   const homeDir = os.homedir();
   const xdgCacheHome = process.env.XDG_CACHE_HOME;

diff --git a/packages/setup-ocaml/src/installer.ts b/packages/setup-ocaml/src/installer.ts
@@ -1,3 +1,4 @@
+import * as fs from "node:fs/promises";
 import * as os from "node:os";
 import * as process from "node:process";
 import * as core from "@actions/core";
@@ -10,6 +11,7 @@ import {
   saveOpamCache,
 } from "./cache.js";
 import {
+  CYGWIN_BASH_ENV,
   CYGWIN_ROOT_BIN,
   DUNE_CACHE,
   DUNE_CACHE_ROOT,
@@ -47,7 +49,6 @@ export async function installer() {
     core.exportVariable("CYGWIN", "winsymlinks:native");
     core.exportVariable("HOME", process.env.USERPROFILE);
     core.exportVariable("MSYS", "winsymlinks:native");
-    core.exportVariable("SHELLOPTS", "igncr");
     await core.group(
       "Change the file system behaviour parameters",
       async () => {
@@ -70,6 +71,8 @@ export async function installer() {
     if (!cygwinCacheHit) {
       await saveCygwinCache();
     }
+    await fs.writeFile(CYGWIN_BASH_ENV, "set -o igncr");
+    core.exportVariable("BASH_ENV", CYGWIN_BASH_ENV);
     core.addPath(CYGWIN_ROOT_BIN);
   }
   await setupOpam();