Env var prefix fix

OrgFlow-Actions · Oct 8, 2024 · bf9f275 · bf9f275
1 parent 48a3f5b
commit bf9f275
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 30 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -52,7 +52,7 @@ jobs:
           stack-name: ${{ needs.setup_job.outputs.stack-name }}
           diag-artifact-name: orgflow_diag_${{ matrix.image }}_${{ github.run_attempt }}
         env:
-          ORGFLOW_ACCEPTEULA: "true"
+          ORGFLOW__ACCEPTEULA: "true"
       - name: Print outputs
         run: |
           echo "Version: ${{ steps.setup.outputs.version }}"

diff --git a/README.md b/README.md
@@ -86,7 +86,7 @@ jobs:
         with:
           license-key: ${{ secrets.ORGFLOW_LICENSEKEY }}
         env:
-          ORGFLOW_ACCEPTEULA: "true"
+          ORGFLOW__ACCEPTEULA: "true"
       # Run command to list stacks in your account
       - run: orgflow stack:list
 ```
@@ -107,7 +107,7 @@ jobs:
           salesforce-password: ${{ secrets.SALESFORCE_PASSWORD }}
           stack-name: MyStack
         env:
-          ORGFLOW_ACCEPTEULA: "true"
+          ORGFLOW__ACCEPTEULA: "true"
       # Run command to flow changes from Dev sandbox into QA sandbox
       - run: orgflow env:flowmerge --from=Dev --into=QA
 ```

diff --git a/dist/main.js b/dist/main.js
@@ -15778,16 +15778,16 @@ function setDiagnostics(logFileName, logLevel) {
     io.mkdirP(logDirPath);
     io.mkdirP(bundleDirPath);
     const logFilePath = path.join(logDirPath, logFileName);
-    core.debug(`Setting ORGFLOW_DIAGNOSTICSFILEDIRECTORYPATH=${bundleDirPath}`);
-    core.debug(`Setting ORGFLOW_LOGFILEPATH=${logFilePath}`);
-    core.exportVariable("ORGFLOW_DIAGNOSTICBUNDLEMODE", "always");
-    core.exportVariable("ORGFLOW_DIAGNOSTICSFILEDIRECTORYPATH", bundleDirPath);
-    core.exportVariable("ORGFLOW_LOGFILEPATH", logFilePath);
-    core.exportVariable("ORGFLOW_LOGLEVEL", logLevel);
-    core.exportVariable("ORGFLOW_DEPLOYMENTS__ENABLEFASTCANCELLATION", "true");
+    core.debug(`Setting ORGFLOW__DIAGNOSTICSFILEDIRECTORYPATH=${bundleDirPath}`);
+    core.debug(`Setting ORGFLOW__LOGFILEPATH=${logFilePath}`);
+    core.exportVariable("ORGFLOW__DIAGNOSTICBUNDLEMODE", "always");
+    core.exportVariable("ORGFLOW__DIAGNOSTICSFILEDIRECTORYPATH", bundleDirPath);
+    core.exportVariable("ORGFLOW__LOGFILEPATH", logFilePath);
+    core.exportVariable("ORGFLOW__LOGLEVEL", logLevel);
+    core.exportVariable("ORGFLOW__DEPLOYMENTS__ENABLEFASTCANCELLATION", "true");
     // Have OrgFlow output errors and warnings in a way that GitHub will recognize:
-    core.exportVariable("ORGFLOW_OUTPUTTEMPLATE_WARNING", "::warning title=OrgFlow Warning::$$msg$$");
-    core.exportVariable("ORGFLOW_OUTPUTTEMPLATE_ERROR", "::error title=OrgFlow Error::$$msg$$");
+    core.exportVariable("ORGFLOW__OUTPUTTEMPLATE_WARNING", "::warning title=OrgFlow Warning::$$msg$$");
+    core.exportVariable("ORGFLOW__OUTPUTTEMPLATE_ERROR", "::error title=OrgFlow Error::$$msg$$");
 }
 exports.setDiagnostics = setDiagnostics;
 function uploadDiagnosticsArtifact(artifactName) {

diff --git a/dist/post.js b/dist/post.js
@@ -10786,16 +10786,16 @@ function setDiagnostics(logFileName, logLevel) {
     io.mkdirP(logDirPath);
     io.mkdirP(bundleDirPath);
     const logFilePath = path.join(logDirPath, logFileName);
-    core.debug(`Setting ORGFLOW_DIAGNOSTICSFILEDIRECTORYPATH=${bundleDirPath}`);
-    core.debug(`Setting ORGFLOW_LOGFILEPATH=${logFilePath}`);
-    core.exportVariable("ORGFLOW_DIAGNOSTICBUNDLEMODE", "always");
-    core.exportVariable("ORGFLOW_DIAGNOSTICSFILEDIRECTORYPATH", bundleDirPath);
-    core.exportVariable("ORGFLOW_LOGFILEPATH", logFilePath);
-    core.exportVariable("ORGFLOW_LOGLEVEL", logLevel);
-    core.exportVariable("ORGFLOW_DEPLOYMENTS__ENABLEFASTCANCELLATION", "true");
+    core.debug(`Setting ORGFLOW__DIAGNOSTICSFILEDIRECTORYPATH=${bundleDirPath}`);
+    core.debug(`Setting ORGFLOW__LOGFILEPATH=${logFilePath}`);
+    core.exportVariable("ORGFLOW__DIAGNOSTICBUNDLEMODE", "always");
+    core.exportVariable("ORGFLOW__DIAGNOSTICSFILEDIRECTORYPATH", bundleDirPath);
+    core.exportVariable("ORGFLOW__LOGFILEPATH", logFilePath);
+    core.exportVariable("ORGFLOW__LOGLEVEL", logLevel);
+    core.exportVariable("ORGFLOW__DEPLOYMENTS__ENABLEFASTCANCELLATION", "true");
     // Have OrgFlow output errors and warnings in a way that GitHub will recognize:
-    core.exportVariable("ORGFLOW_OUTPUTTEMPLATE_WARNING", "::warning title=OrgFlow Warning::$$msg$$");
-    core.exportVariable("ORGFLOW_OUTPUTTEMPLATE_ERROR", "::error title=OrgFlow Error::$$msg$$");
+    core.exportVariable("ORGFLOW__OUTPUTTEMPLATE_WARNING", "::warning title=OrgFlow Warning::$$msg$$");
+    core.exportVariable("ORGFLOW__OUTPUTTEMPLATE_ERROR", "::error title=OrgFlow Error::$$msg$$");
 }
 exports.setDiagnostics = setDiagnostics;
 function uploadDiagnosticsArtifact(artifactName) {

diff --git a/lib/diag.ts b/lib/diag.ts
@@ -30,18 +30,18 @@ export function setDiagnostics(logFileName: string, logLevel: string)
 
 	const logFilePath = path.join(logDirPath, logFileName);
 
-	core.debug(`Setting ORGFLOW_DIAGNOSTICSFILEDIRECTORYPATH=${bundleDirPath}`);
-	core.debug(`Setting ORGFLOW_LOGFILEPATH=${logFilePath}`);
+	core.debug(`Setting ORGFLOW__DIAGNOSTICSFILEDIRECTORYPATH=${bundleDirPath}`);
+	core.debug(`Setting ORGFLOW__LOGFILEPATH=${logFilePath}`);
 
-	core.exportVariable("ORGFLOW_DIAGNOSTICBUNDLEMODE", "always");
-	core.exportVariable("ORGFLOW_DIAGNOSTICSFILEDIRECTORYPATH", bundleDirPath);
-	core.exportVariable("ORGFLOW_LOGFILEPATH", logFilePath);
-	core.exportVariable("ORGFLOW_LOGLEVEL", logLevel);
-	core.exportVariable("ORGFLOW_DEPLOYMENTS__ENABLEFASTCANCELLATION", "true");
+	core.exportVariable("ORGFLOW__DIAGNOSTICBUNDLEMODE", "always");
+	core.exportVariable("ORGFLOW__DIAGNOSTICSFILEDIRECTORYPATH", bundleDirPath);
+	core.exportVariable("ORGFLOW__LOGFILEPATH", logFilePath);
+	core.exportVariable("ORGFLOW__LOGLEVEL", logLevel);
+	core.exportVariable("ORGFLOW__DEPLOYMENTS__ENABLEFASTCANCELLATION", "true");
 
 	// Have OrgFlow output errors and warnings in a way that GitHub will recognize:
-	core.exportVariable("ORGFLOW_OUTPUTTEMPLATE_WARNING", "::warning title=OrgFlow Warning::$$msg$$");
-	core.exportVariable("ORGFLOW_OUTPUTTEMPLATE_ERROR", "::error title=OrgFlow Error::$$msg$$");
+	core.exportVariable("ORGFLOW__OUTPUTTEMPLATE_WARNING", "::warning title=OrgFlow Warning::$$msg$$");
+	core.exportVariable("ORGFLOW__OUTPUTTEMPLATE_ERROR", "::error title=OrgFlow Error::$$msg$$");
 }
 
 export async function uploadDiagnosticsArtifact(artifactName: string)