Merge pull request #1372 from WolframResearch/bugfix/more-build-fixes

Misc build fixes

Author: rhennigan

.github/workflows/Build.yml

@@ -44,7 +44,7 @@ jobs:
         unzip -o /tmp/ResourceSystem.zip -d Assets/Snippets/Streamable/ResourceSystem
 
     - name: Build
-      run: wolframscript -f Scripts/BuildPaclet.wls
+      run: wolframscript -f Scripts/BuildPaclet.wls --snippets=false
 
     - name: Upload Artifact
       uses: actions/upload-artifact@v4

.github/workflows/ExperimentalRelease.yml

@@ -34,7 +34,7 @@ jobs:
         apt-get update && apt-get install software-properties-common -y
         add-apt-repository ppa:git-core/ppa -y
         apt-get update && apt-get install git -y
-        wget ${{ env.GH_INSTALL_URL }} -O gh.deb
+        curl -fsSL ${{ env.GH_INSTALL_URL }} -o gh.deb
         dpkg -i gh.deb
 
     - name: Checkout
@@ -51,7 +51,7 @@ jobs:
         unzip -o /tmp/ResourceSystem.zip -d Assets/Snippets/Streamable/ResourceSystem
 
     - name: Build Paclet
-      run: wolframscript -f Scripts/BuildPaclet.wls
+      run: wolframscript -f Scripts/BuildPaclet.wls --snippets=false
 
     - name: Rename Paclet File
       run: mv "${{ env.PACLET_PATH }}" "${{ env.PACLET_BUILD_DIR }}/Wolfram__Chatbook.paclet"

.github/workflows/Release.yml

@@ -44,7 +44,7 @@ jobs:
         unzip -o /tmp/ResourceSystem.zip -d Assets/Snippets/Streamable/ResourceSystem
 
     - name: Build
-      run: wolframscript -f Scripts/BuildPaclet.wls --check=true
+      run: wolframscript -f Scripts/BuildPaclet.wls --check=true --snippets=false
 
     - name: InstallTestDependencies
       run: |
@@ -74,14 +74,24 @@ jobs:
         apt-get update && apt-get install software-properties-common -y
         add-apt-repository ppa:git-core/ppa -y
         apt-get update && apt-get install git -y
-        wget ${{ env.GH_INSTALL_URL }} -O gh.deb
+        curl -fsSL ${{ env.GH_INSTALL_URL }} -o gh.deb
         dpkg -i gh.deb
 
     - name: Checkout
       uses: actions/checkout@v4
 
+    - name: Download Snippets
+      run: |
+        apt-get update && apt-get install -y unzip
+        mkdir -p Assets/Snippets/Streamable/Documentation
+        mkdir -p Assets/Snippets/Streamable/ResourceSystem
+        curl -L -o /tmp/Documentation.zip "https://www.wolframcloud.com/obj/wolframai-content/StreamableSnippets/Documentation/14-3-0-11967661.zip"
+        curl -L -o /tmp/ResourceSystem.zip "https://www.wolframcloud.com/obj/wolframai-content/StreamableSnippets/ResourceSystem/1-0-0.zip"
+        unzip -o /tmp/Documentation.zip -d Assets/Snippets/Streamable/Documentation
+        unzip -o /tmp/ResourceSystem.zip -d Assets/Snippets/Streamable/ResourceSystem
+
     - name: Build
-      run: wolframscript -f Scripts/BuildPaclet.wls --check=false
+      run: wolframscript -f Scripts/BuildPaclet.wls --check=false --snippets=false
 
     - name: CreateRelease
       env:

Scripts/BuildPaclet.wls

@@ -7,7 +7,6 @@ BeginPackage[ "Wolfram`ChatbookScripts`" ];
 (*Initialization*)
 If[ ! TrueQ @ $loadedDefinitions, Get @ FileNameJoin @ { DirectoryName @ $InputFileName, "Common.wl" } ];
 If[ ! StringQ @ Environment[ "GITHUB_ACTIONS" ], System`$PublisherID = "Wolfram" ];
-Needs[ "Wolfram`PacletCICD`" -> "cicd`" ];
 
 (* ::**************************************************************************************************************:: *)
 (* ::Subsection::Closed:: *)
@@ -16,7 +15,7 @@ $check    = getBooleanArgument[ { "c", "check"    }, True  ];
 $install  = getBooleanArgument[ { "i", "install"  }, False ];
 $mx       = getBooleanArgument[ { "m", "mx"       }, True  ];
 $unformat = getBooleanArgument[ { "u", "unformat" }, True  ];
-$download = getBooleanArgument[ { "s", "snippets" }, False ];
+$download = getBooleanArgument[ { "s", "snippets" }, True  ];
 
 (* ::**************************************************************************************************************:: *)
 (* ::Subsection::Closed:: *)
@@ -30,38 +29,6 @@ If[ $check   , Get @ cFile @ FileNameJoin @ { $scriptDir, "Resources", "CodeInsp
 (*Other*)
 Needs[ "Wolfram`PacletCICD`" -> "cicd`" ];
 
-(* ::**************************************************************************************************************:: *)
-(* ::Section::Closed:: *)
-(*Download Snippets*)
-$baseSnippetsURL = "https://github.com/WolframResearch/Chatbook/releases/download/";
-
-downloadSnippets[ ] :=
-    Enclose @ Module[ { targetDir, docZip, rsZip },
-        targetDir = FileNameJoin @ { $pacletDir, "Assets/Snippets/Streamable" };
-
-        docZip = URLDownload[
-            $baseSnippetsURL <> "Snippets-Documentation-14-3-0-11967661/Documentation.zip",
-            FileNameJoin @ { $TemporaryDirectory, "Documentation.zip" }
-        ];
-
-        rsZip = URLDownload[
-            $baseSnippetsURL <> "Snippets-ResourceSystem-1-0-0/ResourceSystem.zip",
-            FileNameJoin @ { $TemporaryDirectory, "ResourceSystem.zip" }
-        ];
-
-        ConfirmMatch[
-            ExtractArchive[ docZip, FileNameJoin @ { targetDir, "Documentation" }, OverwriteTarget -> True ],
-            { __String? FileExistsQ }
-        ];
-
-        ConfirmMatch[
-            ExtractArchive[ rsZip, FileNameJoin @ { targetDir, "ResourceSystem" }, OverwriteTarget -> True ],
-            { __String? FileExistsQ }
-        ];
-
-        cicd`ConsoleLog @ SequenceForm[ "Downloaded snippets files: ", FileNames[ All, targetDir, Infinity ] ]
-    ];
-
 (* ::**************************************************************************************************************:: *)
 (* ::Section::Closed:: *)
 (*Run*)
@@ -72,13 +39,12 @@ downloadSnippets[ ] :=
 If[ $download,
     Block[ { $ProgressReporting = True },
         cicd`ConsoleLog[ "Downloading documentation snippets..." ];
-        downloadSnippets[ ]
-        (* snippetDir = cDir @ Wolfram`Chatbook`InstallDocumentationResources[ ][ "Location" ];
+        snippetDir = cDir @ Wolfram`Chatbook`InstallDocumentationResources[ ][ "Location" ];
         targetDir = FileNameJoin @ { $pacletDir, "Assets/Snippets/Streamable" };
         If[ DirectoryQ @ targetDir, DeleteDirectory[ targetDir, DeleteContents -> True ] ];
         copied = cDir @ CopyDirectory[ snippetDir, targetDir ];
         cicd`ConsoleLog @ SequenceForm[ "Copied documentation snippets to: ", copied ];
-        If[ StringQ @ Environment[ "GITHUB_ACTIONS" ], DeleteDirectory[ snippetDir, DeleteContents -> True ] ]; *)
+        If[ StringQ @ Environment[ "GITHUB_ACTIONS" ], DeleteDirectory[ snippetDir, DeleteContents -> True ] ];
     ]
 ];