Merge pull request #17 from rhennigan/feature/updated-workflows

Feature/updated workflows
rhennigan · Nov 1, 2022 · 51deeec · 51deeec
2 parents 9b25f24 + 05d9299
commit 51deeec
Show file tree

Hide file tree

Showing 4 changed files with 82 additions and 50 deletions.
diff --git a/.github/workflows/Check.yml b/.github/workflows/Check.yml
@@ -1,37 +1,45 @@
 name: Check
 on: 
+  workflow_dispatch:
   pull_request: 
     branches:  [main]
-  workflow_dispatch:
   schedule: 
   - cron: '30 12 * * *'
 concurrency: 
   group: ${{ github.ref }}
   cancel-in-progress: true
 env: 
-  WOLFRAM_SYSTEM_ID: Linux-x86-64
-  WOLFRAMSCRIPT_ENTITLEMENTID: ${{ secrets.WOLFRAMSCRIPT_ENTITLEMENTID }}
   RESOURCE_PUBLISHER_TOKEN: ${{ secrets.RESOURCE_PUBLISHER_TOKEN }}
+  WOLFRAMSCRIPT_ENTITLEMENTID: ${{ secrets.WOLFRAMSCRIPT_ENTITLEMENTID }}
+  WLPR_PACLET_SITE: https://resources.wolframcloud.com/PacletRepository/pacletsite
 jobs: 
   Check: 
     name: Check
     runs-on: ubuntu-latest
     container: 
-      image: wolframresearch/wolframengine:latest
+      image: wolframresearch/wolframengine:13.0.1
       options: --user root
+    env: 
+      WOLFRAM_SYSTEM_ID: Linux-x86-64
     timeout-minutes: 15
     steps: 
     - name: Checkout
       id: checkout-code-step
       uses: actions/checkout@v3
     - name: BuildMX
-      run: wolframscript Scripts/BuildMX.wls
+      run: |
+        if [ "${{ env.WLPR_PACLET_SITE }}" != "" ]
+        then
+            echo 'Updating paclet sites...'
+            wolframscript -code 'PacletInstall["PacletManager"];PacletSiteRegister["${{ env.WLPR_PACLET_SITE }}"];PacletSiteUpdate[PacletSites[]];Quit[]' > /dev/null
+        fi
+        wolframscript Scripts/BuildMX.wls
     - name: Build
       id: build-paclet-step
-      uses: WolframResearch/build-paclet@v1.9.0
+      uses: WolframResearch/build-paclet@v1.10.2
       with: 
         target: Submit
-        paclet_cicd_version: 0.32.0
+        paclet_cicd_version: 0.33.3
         definition_notebook: ./ResourceDefinition.nb
         resource_system_base: https://www.wolframcloud.com/obj/resourcesystem/api/1.0
     - name: UploadArtifact
@@ -44,27 +52,28 @@ jobs:
     name: Test
     runs-on: ubuntu-latest
     container: 
-      image: wolframresearch/wolframengine:latest
+      image: wolframresearch/wolframengine:13.0.1
       options: --user root
+    env: 
+      WOLFRAM_SYSTEM_ID: Linux-x86-64
     timeout-minutes: 30
     steps: 
     - name: Checkout
       id: checkout-code-step
       uses: actions/checkout@v3
     - name: BuildMX
-      run: wolframscript Scripts/BuildMX.wls
+      run: |
+        if [ "${{ env.WLPR_PACLET_SITE }}" != "" ]
+        then
+            echo 'Updating paclet sites...'
+            wolframscript -code 'PacletInstall["PacletManager"];PacletSiteRegister["${{ env.WLPR_PACLET_SITE }}"];PacletSiteUpdate[PacletSites[]];Quit[]' > /dev/null
+        fi
+        wolframscript Scripts/BuildMX.wls
     - name: Test
       id: test-paclet-step
-      uses: WolframResearch/test-paclet@v1.9.0
+      uses: WolframResearch/test-paclet@v1.10.2
       with: 
         target: Submit
-        paclet_cicd_version: 0.32.0
+        paclet_cicd_version: 0.33.3
         definition_notebook: ./ResourceDefinition.nb
-        resource_system_base: https://www.wolframcloud.com/obj/resourcesystem/api/1.0
-    - name: UploadTestResults
-      id: upload-test-results-step
-      if: always() && env.PACLET_TEST_RESULTS
-      uses: actions/upload-artifact@v3
-      with: 
-        path: ${{ env.PACLET_TEST_RESULTS }}
-        if-no-files-found: ignore
+        resource_system_base: https://www.wolframcloud.com/obj/resourcesystem/api/1.0
diff --git a/.github/workflows/Release.yml b/.github/workflows/Release.yml
@@ -1,85 +1,102 @@
 name: Release
 on: 
+  workflow_dispatch:
   push: 
     branches:  ['release/*']
-  workflow_dispatch:
 concurrency: 
   group: ${{ github.ref }}
   cancel-in-progress: true
 env: 
-  WOLFRAM_SYSTEM_ID: Linux-x86-64
-  WOLFRAMSCRIPT_ENTITLEMENTID: ${{ secrets.WOLFRAMSCRIPT_ENTITLEMENTID }}
   RESOURCE_PUBLISHER_TOKEN: ${{ secrets.RESOURCE_PUBLISHER_TOKEN }}
+  WOLFRAMSCRIPT_ENTITLEMENTID: ${{ secrets.WOLFRAMSCRIPT_ENTITLEMENTID }}
+  WLPR_PACLET_SITE: https://resources.wolframcloud.com/PacletRepository/pacletsite
 jobs: 
   Check: 
     name: Check
     runs-on: ubuntu-latest
     container: 
-      image: wolframresearch/wolframengine:latest
+      image: wolframresearch/wolframengine:13.0.1
       options: --user root
+    env: 
+      WOLFRAM_SYSTEM_ID: Linux-x86-64
     timeout-minutes: 15
     steps: 
     - name: Checkout
       id: checkout-code-step
       uses: actions/checkout@v3
     - name: BuildMX
-      run: wolframscript Scripts/BuildMX.wls
+      run: |
+        if [ "${{ env.WLPR_PACLET_SITE }}" != "" ]
+        then
+            echo 'Updating paclet sites...'
+            wolframscript -code 'PacletInstall["PacletManager"];PacletSiteRegister["${{ env.WLPR_PACLET_SITE }}"];PacletSiteUpdate[PacletSites[]];Quit[]' > /dev/null
+        fi
+        wolframscript Scripts/BuildMX.wls
     - name: Check
       id: check-paclet-step
-      uses: WolframResearch/check-paclet@v1.9.0
+      uses: WolframResearch/check-paclet@v1.10.2
       with: 
         target: Submit
-        paclet_cicd_version: 0.32.0
+        paclet_cicd_version: 0.33.3
         definition_notebook: ./ResourceDefinition.nb
         resource_system_base: https://www.wolframcloud.com/obj/resourcesystem/api/1.0
   Test: 
     name: Test
     runs-on: ubuntu-latest
     container: 
-      image: wolframresearch/wolframengine:latest
+      image: wolframresearch/wolframengine:13.0.1
       options: --user root
+    env: 
+      WOLFRAM_SYSTEM_ID: Linux-x86-64
     timeout-minutes: 30
     steps: 
     - name: Checkout
       id: checkout-code-step
       uses: actions/checkout@v3
     - name: BuildMX
-      run: wolframscript Scripts/BuildMX.wls
+      run: |
+        if [ "${{ env.WLPR_PACLET_SITE }}" != "" ]
+        then
+            echo 'Updating paclet sites...'
+            wolframscript -code 'PacletInstall["PacletManager"];PacletSiteRegister["${{ env.WLPR_PACLET_SITE }}"];PacletSiteUpdate[PacletSites[]];Quit[]' > /dev/null
+        fi
+        wolframscript Scripts/BuildMX.wls
     - name: Test
       id: test-paclet-step
-      uses: WolframResearch/test-paclet@v1.9.0
+      uses: WolframResearch/test-paclet@v1.10.2
       with: 
         target: Submit
-        paclet_cicd_version: 0.32.0
+        paclet_cicd_version: 0.33.3
         definition_notebook: ./ResourceDefinition.nb
         resource_system_base: https://www.wolframcloud.com/obj/resourcesystem/api/1.0
-    - name: UploadTestResults
-      id: upload-test-results-step
-      if: always() && env.PACLET_TEST_RESULTS
-      uses: actions/upload-artifact@v3
-      with: 
-        path: ${{ env.PACLET_TEST_RESULTS }}
-        if-no-files-found: ignore
   Release: 
     name: Release
     needs:  [Check, Test]
     runs-on: ubuntu-latest
     container: 
-      image: wolframresearch/wolframengine:latest
+      image: wolframresearch/wolframengine:13.0.1
       options: --user root
+    env: 
+      WOLFRAM_SYSTEM_ID: Linux-x86-64
     timeout-minutes: 30
     steps: 
     - name: Checkout
       id: checkout-code-step
       uses: actions/checkout@v3
     - name: BuildMX
-      run: wolframscript Scripts/BuildMX.wls
+      run: |
+        if [ "${{ env.WLPR_PACLET_SITE }}" != "" ]
+        then
+            echo 'Updating paclet sites...'
+            wolframscript -code 'PacletInstall["PacletManager"];PacletSiteRegister["${{ env.WLPR_PACLET_SITE }}"];PacletSiteUpdate[PacletSites[]];Quit[]' > /dev/null
+        fi
+        wolframscript Scripts/BuildMX.wls
     - name: Build
       id: build-paclet-step
-      uses: WolframResearch/build-paclet@v1.9.0
+      uses: WolframResearch/build-paclet@v1.10.2
       with: 
         target: Submit
-        paclet_cicd_version: 0.32.0
+        paclet_cicd_version: 0.33.3
         definition_notebook: ./ResourceDefinition.nb
         resource_system_base: https://www.wolframcloud.com/obj/resourcesystem/api/1.0
     - name: UploadArtifact
@@ -113,20 +130,28 @@ jobs:
     needs:  [Check, Test]
     runs-on: ubuntu-latest
     container: 
-      image: wolframresearch/wolframengine:latest
+      image: wolframresearch/wolframengine:13.0.1
       options: --user root
+    env: 
+      WOLFRAM_SYSTEM_ID: Linux-x86-64
     timeout-minutes: 30
     steps: 
     - name: Checkout
       id: checkout-code-step
       uses: actions/checkout@v3
     - name: BuildMX
-      run: wolframscript Scripts/BuildMX.wls
+      run: |
+        if [ "${{ env.WLPR_PACLET_SITE }}" != "" ]
+        then
+            echo 'Updating paclet sites...'
+            wolframscript -code 'PacletInstall["PacletManager"];PacletSiteRegister["${{ env.WLPR_PACLET_SITE }}"];PacletSiteUpdate[PacletSites[]];Quit[]' > /dev/null
+        fi
+        wolframscript Scripts/BuildMX.wls
     - name: Submit
       id: submit-paclet-step
-      uses: WolframResearch/submit-paclet@v1.9.0
+      uses: WolframResearch/submit-paclet@v1.10.2
       with: 
-        paclet_cicd_version: 0.32.0
+        paclet_cicd_version: 0.33.3
         definition_notebook: ./ResourceDefinition.nb
         resource_system_base: https://www.wolframcloud.com/obj/resourcesystem/api/1.0
     - name: UploadArtifact

diff --git a/PacletInfo.wl b/PacletInfo.wl
@@ -7,7 +7,7 @@ PacletObject[ <|
     "DocumentationURL" -> "https://paclets.com",
     "License"          -> "MIT",
     "PublisherID"      -> "Wolfram",
-    "Version"          -> "2.3.0",
+    "Version"          -> "2.3.1",
     "WolframVersion"   -> "12.2+",
     "Keywords"         -> {
         "canonical forms",

diff --git a/Scripts/CreateWorkflows.wls b/Scripts/CreateWorkflows.wls
@@ -31,8 +31,7 @@ $check = Workflow[
                 {
                     "Checkout",
                     WorkflowStep @ File[ "Scripts/BuildMX.wls" ],
-                    "Test",
-                    "UploadTestResults"
+                    "Test"
                 },
                 <| "Name" -> "Test" |>,
                 TimeConstraint -> Quantity[ 30, "Minutes" ]
@@ -62,8 +61,7 @@ $release =
                     {
                         "Checkout",
                         WorkflowStep @ File[ "Scripts/BuildMX.wls" ],
-                        "Test",
-                        "UploadTestResults"
+                        "Test"
                     },
                     <| "Name" -> "Test" |>,
                     TimeConstraint -> Quantity[ 30, "Minutes" ]