Skip to content

Commit

Permalink
Merge pull request #74 from WolframResearch/bugfix/failures-in-check-…
Browse files Browse the repository at this point in the history
…summary-report

Bugfix: Fixed incorrect property name in `HintData`
  • Loading branch information
rhennigan authored Dec 19, 2024
2 parents d19a683 + 2c831fc commit a83684d
Show file tree
Hide file tree
Showing 7 changed files with 28 additions and 125 deletions.
66 changes: 8 additions & 58 deletions .github/workflows/check-paclet.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
name: Check Paclet

on:
schedule:
- cron: '30 12 * * *'
pull_request:
branches: ["main"]
workflow_dispatch:
Expand Down Expand Up @@ -42,7 +40,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
Expand Down Expand Up @@ -95,7 +93,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
Expand Down Expand Up @@ -149,7 +147,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
Expand Down Expand Up @@ -185,54 +183,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]
Expand All @@ -247,7 +197,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
Expand All @@ -257,7 +207,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 }}
Expand Down Expand Up @@ -309,13 +259,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
Expand All @@ -325,7 +275,7 @@ jobs:

- name: RestoreCachedWolframEngine
id: cache-restore-step
uses: actions/cache@v3
uses: actions/cache@v4
env:
WOLFRAMENGINE_INSTALLATION_DIRECTORY: '${{ runner.temp }}\WolframEngine'
with:
Expand Down
71 changes: 12 additions & 59 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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]
Expand All @@ -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
Expand All @@ -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 }}
Expand Down Expand Up @@ -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
Expand All @@ -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:
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions Kernel/CheckPaclet.wl
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ $checkHintData := withConsoleType[
DeleteMissing /@ dnc`HintData[
"Paclet",
None,
{ "Tag", "Level", "MessageText", "CellID", "SourcePosition" }
{ "Tag", "Level", "Message", "CellID", "SourcePosition" }
]
];

Expand Down Expand Up @@ -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 }
Expand Down
2 changes: 1 addition & 1 deletion Kernel/PacletCICD.wl
Original file line number Diff line number Diff line change
Expand Up @@ -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" ];
Expand Down
6 changes: 3 additions & 3 deletions Kernel/Workflows.wl
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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 @ <|
Expand Down
2 changes: 1 addition & 1 deletion PacletInfo.wl
Original file line number Diff line number Diff line change
Expand Up @@ -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$",
Expand Down
2 changes: 1 addition & 1 deletion Tests/Units.wlt
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down

0 comments on commit a83684d

Please sign in to comment.