Merge pull request #42 from esy/prometheansacrifice/optional-ocaml-static-compiler-version

Removes static compiler version field

Author: ManasJayanth

dist/index.js

@@ -143889,7 +143889,6 @@ const manifestKey = core.getInput("manifest");
 const prepareNPMArtifactsMode = core.getInput("prepare-npm-artifacts-mode");
 const bundleNPMArtifactsMode = core.getInput("bundle-npm-artifacts-mode");
 const compilerVersion = core.getInput("ocaml-compiler-version");
-const staticCompilerVersion = core.getInput("ocaml-static-compiler-version");
 const customPostInstallJS = core.getInput("postinstall-js");
 const setupEsy = core.getInput("setup-esy") || true; // Default behaviour is to install esy for user and cache it
 const setupEsyTarball = core.getInput("setup-esy-tarball");
@@ -144106,9 +144105,6 @@ function prepareNPMArtifacts() {
         if (!compilerVersion) {
             throw new Error("Prepare bundle-npm-artifacts needs `ocaml-compiler-version` field to be set in github actions");
         }
-        if (!staticCompilerVersion) {
-            throw new Error("Prepare bundle-npm-artifacts needs `ocaml-static-compiler-version` field to be set in github actions");
-        }
         const statusCmd = manifestKey ? `esy ${manifestKey} status` : "esy status";
         try {
             const manifestFilePath = JSON.parse(external_child_process_.execSync(statusCmd, { cwd: workingDirectory }).toString()).rootPackageConfigPath;
@@ -144157,9 +144153,6 @@ function bundleNPMArtifacts() {
         if (!compilerVersion) {
             throw new Error("Prepare bundle-npm-artifacts needs `ocaml-compiler-version` field to be set in github actions");
         }
-        if (!staticCompilerVersion) {
-            throw new Error("Prepare bundle-npm-artifacts needs `ocaml-static-compiler-version` field to be set in github actions");
-        }
         external_fs_.statSync(workingDirectory);
         process.chdir(workingDirectory);
         const releaseFolder = external_path_.join(workingDirectory, "_npm-release");
@@ -144214,7 +144207,7 @@ function bundleNPMArtifacts() {
             repository: mainPackageJson.repository,
             scripts: {
                 postinstall: rewritePrefix
-                    ? `node -e \"process.env['OCAML_VERSION'] = process.platform == 'linux' ? '${staticCompilerVersion}': '${compilerVersion}'; process.env['OCAML_PKG_NAME'] = 'ocaml'; process.env['ESY_RELEASE_REWRITE_PREFIX']=true; require('./postinstall.js')\"`
+                    ? `node -e \"process.env['OCAML_VERSION'] = '${compilerVersion}'; process.env['OCAML_PKG_NAME'] = 'ocaml'; process.env['ESY_RELEASE_REWRITE_PREFIX']=true; require('./postinstall.js')\"`
                     : "node ./postinstall.js",
             },
             bin: bins,

index.ts

@@ -35,7 +35,6 @@ const manifestKey = core.getInput("manifest");
 const prepareNPMArtifactsMode = core.getInput("prepare-npm-artifacts-mode");
 const bundleNPMArtifactsMode = core.getInput("bundle-npm-artifacts-mode");
 const compilerVersion = core.getInput("ocaml-compiler-version");
-const staticCompilerVersion = core.getInput("ocaml-static-compiler-version");
 const customPostInstallJS = core.getInput("postinstall-js");
 const setupEsy = core.getInput("setup-esy") || true; // Default behaviour is to install esy for user and cache it
 const setupEsyTarball = core.getInput("setup-esy-tarball");
@@ -305,11 +304,6 @@ async function prepareNPMArtifacts() {
     );
   }
 
-  if (!staticCompilerVersion) {
-    throw new Error(
-      "Prepare bundle-npm-artifacts needs `ocaml-static-compiler-version` field to be set in github actions"
-    );
-  }
   const statusCmd = manifestKey ? `esy ${manifestKey} status` : "esy status";
   try {
     const manifestFilePath = JSON.parse(
@@ -368,12 +362,6 @@ async function bundleNPMArtifacts() {
     );
   }
 
-  if (!staticCompilerVersion) {
-    throw new Error(
-      "Prepare bundle-npm-artifacts needs `ocaml-static-compiler-version` field to be set in github actions"
-    );
-  }
-
   fs.statSync(workingDirectory);
   process.chdir(workingDirectory);
   const releaseFolder = path.join(workingDirectory, "_npm-release");
@@ -448,7 +436,7 @@ async function bundleNPMArtifacts() {
       repository: mainPackageJson.repository,
       scripts: {
         postinstall: rewritePrefix
-          ? `node -e \"process.env['OCAML_VERSION'] = process.platform == 'linux' ? '${staticCompilerVersion}': '${compilerVersion}'; process.env['OCAML_PKG_NAME'] = 'ocaml'; process.env['ESY_RELEASE_REWRITE_PREFIX']=true; require('./postinstall.js')\"`
+          ? `node -e \"process.env['OCAML_VERSION'] = '${compilerVersion}'; process.env['OCAML_PKG_NAME'] = 'ocaml'; process.env['ESY_RELEASE_REWRITE_PREFIX']=true; require('./postinstall.js')\"`
           : "node ./postinstall.js",
       },
       bin: bins,