Merge pull request #66 from WolframResearch/bugfix/cannot-download-wo…

…rkflow-values-in-first-job Bugfix/cannot download workflow values in first job
WolframResearch · Oct 15, 2022 · 25ad6eb · 25ad6eb
2 parents feba1b7 + 24bbf51
commit 25ad6eb
Show file tree

Hide file tree

Showing 15 changed files with 391 additions and 136 deletions.
diff --git a/.github/workflows/check-paclet.yml b/.github/workflows/check-paclet.yml
@@ -28,9 +28,10 @@ jobs:
     name: Check
     runs-on: ubuntu-latest
     container:
-      image: wolframresearch/wolframengine:latest
+      image: wolframresearch/wolframengine:13.0.1
       options: --user root --privileged --init --ulimit core=-1
     timeout-minutes: 20
+
     steps:
       - name: Setup debugging
         if: env.ACTIONS_STEP_DEBUG
@@ -44,11 +45,11 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Build paclet MX
-        run: wolframscript Scripts/BuildPacletMX.wls
+        run: bash Scripts/RunScript.sh BuildPacletMX.wls
 
       - name: Check paclet
-        run: wolframscript Scripts/CheckPaclet.wls
-      
+        run: bash Scripts/RunScript.sh CheckPaclet.wls
+
       - name: Upload core dump
         if: always() && env.ACTIONS_STEP_DEBUG
         uses: actions/upload-artifact@v3
@@ -80,9 +81,10 @@ jobs:
     name: Build
     runs-on: ubuntu-latest
     container:
-      image: wolframresearch/wolframengine:latest
+      image: wolframresearch/wolframengine:13.0.1
       options: --user root --privileged --init --ulimit core=-1
     timeout-minutes: 20
+
     steps:
       - name: Setup debugging
         if: env.ACTIONS_STEP_DEBUG
@@ -96,10 +98,10 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Build paclet MX
-        run: wolframscript Scripts/BuildPacletMX.wls
+        run: bash Scripts/RunScript.sh BuildPacletMX.wls
 
       - name: Build paclet
-        run: wolframscript Scripts/BuildPaclet.wls
+        run: bash Scripts/RunScript.sh BuildPaclet.wls
 
       - name: Upload core dump
         if: always() && env.ACTIONS_STEP_DEBUG
@@ -140,7 +142,7 @@ jobs:
     needs: [Build]
     runs-on: ubuntu-latest
     container: 
-      image: wolframresearch/wolframengine:latest
+      image: wolframresearch/wolframengine:13.0.1
       options: --user root
     timeout-minutes: 10
 
@@ -163,7 +165,7 @@ jobs:
           path: MXBuild
 
       - name: Test paclet
-        run: wolframscript Scripts/TestPaclet.wls
+        run: bash Scripts/RunScript.sh TestPaclet.wls
 
       - name: Upload stack data
         if: always() && env.PACLET_STACK_HISTORY

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -21,15 +21,16 @@ jobs:
       image: wolframresearch/wolframengine:latest
       options: --user root
     timeout-minutes: 10
+
     steps:
       - name: Checkout files
         uses: actions/checkout@v3
 
       - name: Build paclet MX
-        run: wolframscript Scripts/BuildPacletMX.wls
+        run: bash Scripts/RunScript.sh BuildPacletMX.wls
 
       - name: Check paclet
-        run: wolframscript Scripts/CheckPaclet.wls
+        run: bash Scripts/RunScript.sh CheckPaclet.wls
 
       - name: Upload stack data
         if: always() && env.PACLET_STACK_HISTORY
@@ -55,15 +56,16 @@ jobs:
       image: wolframresearch/wolframengine:latest
       options: --user root
     timeout-minutes: 10
+
     steps:
       - name: Checkout files
         uses: actions/checkout@v3
 
       - name: Build paclet MX
-        run: wolframscript Scripts/BuildPacletMX.wls
+        run: bash Scripts/RunScript.sh BuildPacletMX.wls
 
       - name: Build paclet
-        run: wolframscript Scripts/BuildPaclet.wls
+        run: bash Scripts/RunScript.sh BuildPaclet.wls
 
       - name: Upload stack data
         if: always() && env.PACLET_STACK_HISTORY
@@ -117,7 +119,7 @@ jobs:
           path: MXBuild
 
       - name: Test paclet
-        run: wolframscript Scripts/TestPaclet.wls
+        run: bash Scripts/RunScript.sh TestPaclet.wls
 
       - name: Upload stack data
         if: always() && env.PACLET_STACK_HISTORY
@@ -323,7 +325,7 @@ jobs:
           path: Release
 
       - name: Set release parameters
-        run: wolframscript Scripts/SetReleaseParameters.wls
+        run: bash Scripts/RunScript.sh SetReleaseParameters.wls
 
       - name: Create release
         id: create_release
@@ -376,10 +378,10 @@ jobs:
           path: .paclet-workflow-values
 
       - name: Build paclet MX
-        run: wolframscript Scripts/BuildPacletMX.wls
+        run: bash Scripts/RunScript.sh BuildPacletMX.wls
 
       - name: Submit paclet
-        run: wolframscript Scripts/SubmitPaclet.wls
+        run: bash Scripts/RunScript.sh SubmitPaclet.wls
 
       - name: Upload stack data
         if: always() && env.PACLET_STACK_HISTORY

diff --git a/Actions/build-paclet b/Actions/build-paclet
diff --git a/Actions/check-paclet b/Actions/check-paclet
diff --git a/Actions/submit-paclet b/Actions/submit-paclet
diff --git a/Actions/test-paclet b/Actions/test-paclet
diff --git a/Kernel/Loading.wl b/Kernel/Loading.wl
@@ -3,6 +3,7 @@
 (*Package Header*)
 BeginPackage[ "Wolfram`PacletCICD`Internal`", { "Wolfram`PacletCICD`" } ];
 
+$BuildingMX;
 $MXFile;
 
 ClearAll[
@@ -74,6 +75,7 @@ SetContextLoad[ sym_Symbol, context_String ] :=
 BuildMX[ ] := (
     LoadSubPackages[ ];
     GeneralUtilities`EnsureDirectory @ DirectoryName @ $MXFile;
+    $BuildingMX = False;
     DumpSave[ $MXFile, "Wolfram`PacletCICD`", "SymbolAttributes" -> False ];
     $MXFile
 );

diff --git a/Kernel/PacletCICD.wl b/Kernel/PacletCICD.wl
@@ -7,7 +7,7 @@ EndPackage[ ];
 (* ::**********************************************************************:: *)
 (* ::Section::Closed:: *)
 (*Install Dependencies*)
-If[ $VersionNumber < 13.2 && StringQ @ Environment[ "GITHUB_WORKFLOW" ],
+If[ StringQ @ Environment[ "GITHUB_WORKFLOW" ],
     Quiet[
         PacletInstall[ "https://github.com/WolframResearch/PacletCICD/releases/download/DefinitionNotebookClient-1.18.0/DefinitionNotebookClient-1.18.0.paclet" ];
         PacletInstall[ "https://github.com/WolframResearch/PacletCICD/releases/download/PacletResource-1.6.0/PacletResource-1.6.0.paclet"                       ];

diff --git a/Kernel/Utilities.wl b/Kernel/Utilities.wl
@@ -500,6 +500,9 @@ ghWFTag[ name_String? StringQ ] :=
         StringRiffle[ { "PacletCICD", job, name }, "/" ] /; StringQ @ job
     ];
 
+ghWFTag[ name_String? StringQ ] :=
+    StringRiffle[ { "PacletCICD", "Job", name }, "/" ];
+
 ghWFTag // catchUndefined;
 
 (* ::**********************************************************************:: *)

diff --git a/Kernel/WorkflowValue.wl b/Kernel/WorkflowValue.wl
@@ -38,23 +38,23 @@ $stepRoot := GeneralUtilities`EnsureDirectory @ { $jobRoot, $ghStepID };
 
 $wfDownloadLocation := ExpandFileName[ ".paclet-workflow-values" ];
 
-$ghWFID := $ghWFID = StringJoin[
+$ghWFID := StringJoin[
     "__Workflow_",
     URLEncode @ Replace[
         Environment[ "GITHUB_WORKFLOW" ],
         Except[ _String ] :> ""
     ]
 ];
 
-$ghJobID := $ghJobID = StringJoin[
+$ghJobID := StringJoin[
     "__Job_",
     URLEncode @ Replace[
         Environment[ "GITHUB_JOB" ],
         Except[ _String ] :> ""
     ]
 ];
 
-$ghStepID := $ghStepID = StringJoin[
+$ghStepID := StringJoin[
     "__Step_",
     IntegerString[ $SessionID, 36 ]
 ];
@@ -68,15 +68,28 @@ $$appendable = _List | _Association? AssociationQ;
 (* ::**********************************************************************:: *)
 (* ::Section::Closed:: *)
 (*InitializeWorkflowValues*)
-InitializeWorkflowValues[ ] := InitializeWorkflowValues @ $wfDownloadLocation;
+InitializeWorkflowValues[ ] :=
+    If[ TrueQ @ Wolfram`PacletCICD`Internal`$BuildingMX,
+        Missing[ "NotAvailable" ],
+        setWorkflowValue[ ".initialization", Null ];
+        importExistingWorkflowValues[ ]
+    ];
+
+InitializeWorkflowValues // catchUndefined;
+
+(* ::**********************************************************************:: *)
+(* ::Subsection::Closed:: *)
+(*importExistingWorkflowValues*)
+importExistingWorkflowValues[ ] :=
+    importExistingWorkflowValues @ $wfDownloadLocation;
 
-InitializeWorkflowValues[ src_? DirectoryQ ] :=
+importExistingWorkflowValues[ src_? DirectoryQ ] :=
     Module[ { files },
         files = FileNames[ "*.wxf", src, Infinity ];
         importDownloadedWFV[ src, # ] & /@ files
     ];
 
-InitializeWorkflowValues[ ___ ] := Missing[ "NotAvailable" ];
+importExistingWorkflowValues[ ___ ] := Missing[ "NotAvailable" ];
 
 (* ::**********************************************************************:: *)
 (* ::Subsection::Closed:: *)