From 4c844553d96261d5c5241e97c5de758281310e37 Mon Sep 17 00:00:00 2001 From: Rick Hennigan Date: Thu, 19 Dec 2024 13:47:53 -0500 Subject: [PATCH 1/5] Bugfix: Fixed incorrect property name in `HintData` --- Kernel/CheckPaclet.wl | 4 ++-- PacletInfo.wl | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Kernel/CheckPaclet.wl b/Kernel/CheckPaclet.wl index ca8aadc..0b4807d 100644 --- a/Kernel/CheckPaclet.wl +++ b/Kernel/CheckPaclet.wl @@ -132,7 +132,7 @@ $checkHintData := withConsoleType[ DeleteMissing /@ dnc`HintData[ "Paclet", None, - { "Tag", "Level", "MessageText", "CellID", "SourcePosition" } + { "Tag", "Level", "Message", "CellID", "SourcePosition" } ] ]; @@ -169,7 +169,7 @@ reportHintRow[ file_, index_ ][ hint_Association ] := lookup = ConfirmBy[ Lookup[ hint, # ], StringQ ] &; level = hintIcon @ lookup[ "Level" ]; tag = lookup[ "Tag" ]; - msg = Style[ lookup[ "MessageText" ], "Text" ]; + msg = Style[ lookup[ "Message" ], "Text" ]; url = sourceFileURL[ file, index, hint ]; link = Hyperlink[ ":link:", url ]; { level, tag, msg, link } diff --git a/PacletInfo.wl b/PacletInfo.wl index cc75c3f..a1d897b 100644 --- a/PacletInfo.wl +++ b/PacletInfo.wl @@ -6,7 +6,7 @@ PacletObject[ <| "SourceControlURL" -> "https://github.com/WolframResearch/PacletCICD", "License" -> "MIT", "PublisherID" -> "Wolfram", - "Version" -> "0.36.1", + "Version" -> "0.36.2", "WolframVersion" -> "13.0+", "ReleaseID" -> "$RELEASE_ID$", "ReleaseDate" -> "$RELEASE_DATE$", From 58becbeb3ad3d9db4fa810992b9fb685300c915c Mon Sep 17 00:00:00 2001 From: Rick Hennigan Date: Thu, 19 Dec 2024 14:10:30 -0500 Subject: [PATCH 2/5] Update default version of WL used in actions --- Kernel/PacletCICD.wl | 2 +- Kernel/Workflows.wl | 6 +++--- Tests/Units.wlt | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Kernel/PacletCICD.wl b/Kernel/PacletCICD.wl index 6977d77..59c6917 100644 --- a/Kernel/PacletCICD.wl +++ b/Kernel/PacletCICD.wl @@ -7,7 +7,7 @@ EndPackage[ ]; (* ::**********************************************************************:: *) (* ::Section::Closed:: *) (*Install Dependencies*) -If[ StringQ @ Environment[ "GITHUB_WORKFLOW" ], +If[ StringQ @ Environment[ "GITHUB_WORKFLOW" ] && $VersionNumber < 14, 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/Workflows.wl b/Kernel/Workflows.wl index c52bf03..e29c116 100644 --- a/Kernel/Workflows.wl +++ b/Kernel/Workflows.wl @@ -2405,7 +2405,7 @@ $compilationTargets = { "Windows-x86-64", "MacOSX-x86-64", "Linux-x86-64" }; $defaultJobContainer := If[ $defaultOS === "Linux-x86-64", <| - "image" -> "wolframresearch/wolframengine:13.0.1", + "image" -> "wolframresearch/wolframengine:14.1.0", "options" -> "--user root" |>, $noValue @@ -2427,14 +2427,14 @@ $defaultJobEnv /; $defaultOS === "MacOSX-x86-64" := takeEnvStrings @ <| "WOLFRAM_SYSTEM_ID" -> "MacOSX-x86-64", "WOLFRAMENGINE_CACHE_KEY" -> "WolframEngine-A", "WOLFRAMENGINE_DOWNLOAD_PATH" -> "/tmp/downloads", - "WOLFRAMENGINE_INSTALL_DMG_DOWNLOAD_URL" -> "https://files.wolframcdn.com/packages/Homebrew/13.0.0.0/WolframEngine_13.0.0_MAC.dmg", + "WOLFRAMENGINE_INSTALL_DMG_DOWNLOAD_URL" -> "https://files.wolframcdn.com/packages/Homebrew/14.1.0.0/WolframEngine_14.1.0_MAC.dmg", "WOLFRAMENGINE_INSTALLATION_DIRECTORY" -> "\"/Applications/Wolfram Engine.app\"" |>; $defaultJobEnv /; $defaultOS === "Windows-x86-64" := takeEnvStrings @ <| "WOLFRAM_SYSTEM_ID" -> "Windows-x86-64", "WOLFRAMENGINE_CACHE_KEY" -> "WolframEngine-A", - "WOLFRAMENGINE_INSTALL_MSI_DOWNLOAD_URL" -> "https://files.wolframcdn.com/packages/winget/13.0.0.0/WolframEngine_13.0.0_WIN.msi" + "WOLFRAMENGINE_INSTALL_MSI_DOWNLOAD_URL" -> "https://files.wolframcdn.com/packages/winget/14.1.0.0/WolframEngine_14.1.0_WIN.msi" |>; $defaultJobEnv /; True := takeEnvStrings @ <| diff --git a/Tests/Units.wlt b/Tests/Units.wlt index d9db1ef..7f8c885 100644 --- a/Tests/Units.wlt +++ b/Tests/Units.wlt @@ -87,7 +87,7 @@ VerificationTest[ VerificationTest[ SecondsToQuantity[ 12346.0 ], Quantity[ - MixedMagnitude @ { 3, 25, 46.000000000000156 }, + MixedMagnitude @ { 3, 25, 46.00000000000037 }, MixedUnit @ { "Hours", "Minutes", "Seconds" } ], TestID -> "SecondsToQuantity-6@@Tests/Units.wlt:87,1-94,2" From e235479d0c1ce6eafe563c22e7801bf3cdf16523 Mon Sep 17 00:00:00 2001 From: Rick Hennigan Date: Thu, 19 Dec 2024 14:30:23 -0500 Subject: [PATCH 3/5] Updated actions and removed job that's no longer supported by GitHub --- .github/workflows/check-paclet.yml | 64 ++++----------------------- .github/workflows/release.yml | 71 +++++------------------------- 2 files changed, 20 insertions(+), 115 deletions(-) diff --git a/.github/workflows/check-paclet.yml b/.github/workflows/check-paclet.yml index 6f4f180..7e5292d 100644 --- a/.github/workflows/check-paclet.yml +++ b/.github/workflows/check-paclet.yml @@ -42,7 +42,7 @@ jobs: sysctl -w kernel.core_pattern=/tmp/cores/core.%e.%p.%h.%t - name: Checkout files - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Build paclet MX run: bash Scripts/RunScript.sh BuildPacletMX.wls @@ -95,7 +95,7 @@ jobs: sysctl -w kernel.core_pattern=/tmp/cores/core.%e.%p.%h.%t - name: Checkout files - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Build paclet MX run: bash Scripts/RunScript.sh BuildPacletMX.wls @@ -149,7 +149,7 @@ jobs: steps: - name: Checkout id: checkout-code-step - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Download workflow values uses: actions/download-artifact@v3 @@ -185,54 +185,6 @@ jobs: retention-days: 1 if-no-files-found: error - Test-Linux-13: - name: Test-Linux-13 - needs: [Build] - runs-on: ubuntu-latest - container: - image: wolframresearch/wolframengine:13.0.1 - options: --user root - timeout-minutes: 10 - - steps: - - name: Checkout - id: checkout-code-step - uses: actions/checkout@v3 - - - name: Download workflow values - uses: actions/download-artifact@v3 - with: - name: paclet-workflow-values - path: .paclet-workflow-values - - - name: Download MX build - id: download-mx-artifacts-step - uses: actions/download-artifact@v3 - with: - name: PacletBuildArtifact - path: MXBuild - - - name: Test paclet - run: bash Scripts/RunScript.sh TestPaclet.wls - - - name: Upload stack data - if: always() && env.PACLET_STACK_HISTORY - uses: actions/upload-artifact@v3 - with: - name: test-paclet-stacks-13-${{ env.WOLFRAM_SYSTEM_ID }} - path: ${{ env.PACLET_STACK_HISTORY }} - retention-days: 1 - if-no-files-found: error - - - name: Upload workflow values - if: always() && env.PACLET_WORKFLOW_VALUES - uses: actions/upload-artifact@v3 - with: - name: paclet-workflow-values - path: ${{ env.PACLET_WORKFLOW_VALUES }} - retention-days: 1 - if-no-files-found: error - Test-MacOSX: name: Test-MacOSX needs: [Build] @@ -247,7 +199,7 @@ jobs: steps: - name: Checkout id: checkout-code-step - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Download workflow values uses: actions/download-artifact@v3 @@ -257,7 +209,7 @@ jobs: - name: RestoreCachedWolframEngine id: cache-restore-step - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: ${{ env.WOLFRAMENGINE_INSTALLATION_DIRECTORY }} key: wolframengine-${{ env.WOLFRAM_SYSTEM_ID }}-${{ env.WOLFRAMENGINE_CACHE_KEY }} @@ -309,13 +261,13 @@ jobs: env: WOLFRAM_SYSTEM_ID: Windows-x86-64 WOLFRAMSCRIPT_ENTITLEMENTID: ${{ secrets.WOLFRAMSCRIPT_ENTITLEMENTID }} - WOLFRAMENGINE_INSTALL_MSI_DOWNLOAD_URL: https://files.wolframcdn.com/packages/winget/13.3.0.0/WolframEngine_13.3.0_WIN.msi + WOLFRAMENGINE_INSTALL_MSI_DOWNLOAD_URL: https://files.wolframcdn.com/packages/winget/14.1.0.0/WolframEngine_14.1.0_WIN.msi timeout-minutes: 20 steps: - name: Checkout id: checkout-code-step - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Download workflow values uses: actions/download-artifact@v3 @@ -325,7 +277,7 @@ jobs: - name: RestoreCachedWolframEngine id: cache-restore-step - uses: actions/cache@v3 + uses: actions/cache@v4 env: WOLFRAMENGINE_INSTALLATION_DIRECTORY: '${{ runner.temp }}\WolframEngine' with: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 305e79a..e42f80d 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -24,7 +24,7 @@ jobs: steps: - name: Checkout files - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Build paclet MX run: bash Scripts/RunScript.sh BuildPacletMX.wls @@ -59,7 +59,7 @@ jobs: steps: - name: Checkout files - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Build paclet MX run: bash Scripts/RunScript.sh BuildPacletMX.wls @@ -103,7 +103,7 @@ jobs: steps: - name: Checkout id: checkout-code-step - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Download workflow values uses: actions/download-artifact@v3 @@ -138,53 +138,6 @@ jobs: retention-days: 1 if-no-files-found: error - Test-Linux-13: - name: Test-Linux-13 - needs: [Build] - runs-on: ubuntu-latest - container: - image: wolframresearch/wolframengine:13.0.1 - options: --user root - timeout-minutes: 10 - - steps: - - name: Checkout - id: checkout-code-step - uses: actions/checkout@v3 - - - name: Download workflow values - uses: actions/download-artifact@v3 - with: - name: paclet-workflow-values - path: .paclet-workflow-values - - - name: Download MX build - id: download-mx-artifacts-step - uses: actions/download-artifact@v3 - with: - name: PacletBuildArtifact - path: MXBuild - - - name: Test paclet - run: bash Scripts/RunScript.sh TestPaclet.wls - - - name: Upload stack data - if: always() && env.PACLET_STACK_HISTORY - uses: actions/upload-artifact@v3 - with: - name: test-paclet-stacks-13-${{ env.WOLFRAM_SYSTEM_ID }} - path: ${{ env.PACLET_STACK_HISTORY }} - if-no-files-found: error - - - name: Upload workflow values - if: always() && env.PACLET_WORKFLOW_VALUES - uses: actions/upload-artifact@v3 - with: - name: paclet-workflow-values - path: ${{ env.PACLET_WORKFLOW_VALUES }} - retention-days: 1 - if-no-files-found: error - Test-MacOSX: name: Test-MacOSX needs: [Build] @@ -199,7 +152,7 @@ jobs: steps: - name: Checkout id: checkout-code-step - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Download workflow values uses: actions/download-artifact@v3 @@ -209,7 +162,7 @@ jobs: - name: RestoreCachedWolframEngine id: cache-restore-step - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: ${{ env.WOLFRAMENGINE_INSTALLATION_DIRECTORY }} key: wolframengine-${{ env.WOLFRAM_SYSTEM_ID }}-${{ env.WOLFRAMENGINE_CACHE_KEY }} @@ -261,13 +214,13 @@ jobs: env: WOLFRAM_SYSTEM_ID: Windows-x86-64 WOLFRAMSCRIPT_ENTITLEMENTID: ${{ secrets.WOLFRAMSCRIPT_ENTITLEMENTID }} - WOLFRAMENGINE_INSTALL_MSI_DOWNLOAD_URL: https://files.wolframcdn.com/packages/winget/13.3.0.0/WolframEngine_13.3.0_WIN.msi + WOLFRAMENGINE_INSTALL_MSI_DOWNLOAD_URL: https://files.wolframcdn.com/packages/winget/14.1.0.0/WolframEngine_14.1.0_WIN.msi timeout-minutes: 20 steps: - name: Checkout id: checkout-code-step - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Download workflow values uses: actions/download-artifact@v3 @@ -277,7 +230,7 @@ jobs: - name: RestoreCachedWolframEngine id: cache-restore-step - uses: actions/cache@v3 + uses: actions/cache@v4 env: WOLFRAMENGINE_INSTALLATION_DIRECTORY: '${{ runner.temp }}\WolframEngine' with: @@ -346,7 +299,7 @@ jobs: Release: name: Release - needs: [Check, Build, Test-Linux, Test-Linux-13, Test-MacOSX, Test-Windows] + needs: [Check, Build, Test-Linux, Test-MacOSX, Test-Windows] runs-on: ubuntu-latest container: image: wolframresearch/wolframengine:latest @@ -355,7 +308,7 @@ jobs: timeout-minutes: 20 steps: - name: Checkout files - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Download workflow values uses: actions/download-artifact@v3 @@ -406,7 +359,7 @@ jobs: Submit: name: Submit - needs: [Check, Test-Linux, Test-Linux-13, Test-MacOSX, Test-Windows] + needs: [Check, Test-Linux, Test-MacOSX, Test-Windows] runs-on: ubuntu-latest container: image: wolframresearch/wolframengine:latest @@ -415,7 +368,7 @@ jobs: timeout-minutes: 20 steps: - name: Checkout files - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Download workflow values uses: actions/download-artifact@v3 From 8fe6912cc14876c98956d41bf0b3dace9a6f33bd Mon Sep 17 00:00:00 2001 From: Rick Hennigan Date: Thu, 19 Dec 2024 15:01:02 -0500 Subject: [PATCH 4/5] Debugging nonzero exit code during Windows testing --- .github/workflows/check-paclet.yml | 2 -- Scripts/TestPaclet.wls | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/check-paclet.yml b/.github/workflows/check-paclet.yml index 7e5292d..05a3273 100644 --- a/.github/workflows/check-paclet.yml +++ b/.github/workflows/check-paclet.yml @@ -1,8 +1,6 @@ name: Check Paclet on: - schedule: - - cron: '30 12 * * *' pull_request: branches: ["main"] workflow_dispatch: diff --git a/Scripts/TestPaclet.wls b/Scripts/TestPaclet.wls index 4e98743..bdf7bfc 100644 --- a/Scripts/TestPaclet.wls +++ b/Scripts/TestPaclet.wls @@ -5,4 +5,6 @@ BeginPackage[ "Wolfram`PacletCICD`Scripts`" ]; Get @ FileNameJoin @ { DirectoryName @ $InputFileName, "Common.wl" }; checkResult @ Wolfram`PacletCICD`TestPaclet @ FileNameJoin @ { $pacDir, "Tests" }; +Print[ "Finished testing" ]; + EndPackage[ ]; From 2c831fc23af5fa191ec21b95f1dd266ecf121aea Mon Sep 17 00:00:00 2001 From: Rick Hennigan Date: Thu, 19 Dec 2024 15:13:16 -0500 Subject: [PATCH 5/5] Remove debug code --- Scripts/TestPaclet.wls | 2 -- 1 file changed, 2 deletions(-) diff --git a/Scripts/TestPaclet.wls b/Scripts/TestPaclet.wls index bdf7bfc..4e98743 100644 --- a/Scripts/TestPaclet.wls +++ b/Scripts/TestPaclet.wls @@ -5,6 +5,4 @@ BeginPackage[ "Wolfram`PacletCICD`Scripts`" ]; Get @ FileNameJoin @ { DirectoryName @ $InputFileName, "Common.wl" }; checkResult @ Wolfram`PacletCICD`TestPaclet @ FileNameJoin @ { $pacDir, "Tests" }; -Print[ "Finished testing" ]; - EndPackage[ ];