tests

i574n · Nov 30, 2023 · f304319 · f304319
1 parent de15675
commit f304319
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/apps/dice/ui/build.ps1 b/apps/dice/ui/build.ps1
@@ -37,7 +37,7 @@ cargo fmt --
 leptosfmt ./src/dice_ui_wasm.rs
 
 if (!$fast) {
-    Remove-Item ./$targetDir/trunk -Recurse -Force -ErrorAction Ignore
+    Remove-Item $targetDir/trunk -Recurse -Force -ErrorAction Ignore
     Remove-Item ./dist -Recurse -Force -ErrorAction Ignore
 
     { pnpm install --frozen-lockfile } | Invoke-Block

diff --git a/scripts/core.ps1 b/scripts/core.ps1
@@ -61,7 +61,7 @@ function Invoke-Block {
             $exitcode = -1
         }
         if ($exitcode -ne 0 -or $Error.Count -gt 0) {
-            $msg = "`n# Invoke-Block / `$Retries: $Retries / `$OnError: $OnError / `$exitcode: $exitcode / `$EnvVars: $($EnvironmentVariables | ConvertTo-Json) / `$Error: '$Error' / `$ScriptBlock:`n'$($ScriptBlock.ToString().Trim())'`n"
+            $msg = "`n# Invoke-Block / `$Retry: $Retries / `$OnError: $OnError / `$exitcode: $exitcode / `$EnvVars: $($EnvironmentVariables | ConvertTo-Json) / `$Error: '$Error' / `$ScriptBlock:`n'$($ScriptBlock.ToString().Trim())'`n"
 
             Write-Host $msg
             if ($OnError -eq "Stop" -and $Retries -le 1) {
@@ -71,6 +71,7 @@ function Invoke-Block {
                     exit ($exitcode, $Error.Count | Measure-Object -Maximum).Maximum
                 }
             }
+            $Error.Clear()
             $Retries--
             continue
         }

diff --git a/scripts/init.dib b/scripts/init.dib
@@ -65,15 +65,15 @@ npx -y [email protected] install
 
 #!pwsh
 
-Install-Module -Name PowerShellGet -Force -AllowClobber -Scope CurrentUser
+{ Install-Module -Name PowerShellGet -Force -AllowClobber -Scope CurrentUser } | Invoke-Block -OnError Continue
 
 #!pwsh
 
-Set-PSRepository -Name PSGallery -InstallationPolicy Trusted
+{ Set-PSRepository -Name PSGallery -InstallationPolicy Trusted } | Invoke-Block -OnError Continue
 
 #!pwsh
 
-Install-Module -Name PSToml -Scope CurrentUser
+{ Install-Module -Name PSToml -Scope CurrentUser -WhatIf } | Invoke-Block -OnError Continue
 
 #!pwsh
 

diff --git a/scripts/init.ps1 b/scripts/init.ps1
@@ -33,7 +33,7 @@ function Search-DotnetSdk($version) {
 
 if (!(Search-DotnetSdk "8")) {
     if (!$IsWindows) {
-        curl -sSL https://dot.net/v1/dotnet-install.sh | bash /dev/stdin --version 8.0.100-rc.1.23463.5
+        curl -sSL https://dot.net/v1/dotnet-install.sh | bash /dev/stdin --version 8.0.100
     }
 }