From 582592dee80633f5477ffe0c0efe79984f354fa3 Mon Sep 17 00:00:00 2001 From: hugoalh <32359235+hugoalh@users.noreply.github.com> Date: Fri, 15 Sep 2023 18:09:44 +0800 Subject: [PATCH] Update list --- action.yml | 4 ++-- list.json | 24 +++++++----------------- 2 files changed, 9 insertions(+), 19 deletions(-) diff --git a/action.yml b/action.yml index 8b8c6b0..7ea104e 100644 --- a/action.yml +++ b/action.yml @@ -127,8 +127,8 @@ runs: If (!(Test-Path -LiteralPath $MainScriptPath -PathType 'Leaf')) { Write-GitHubActionsFail -Message 'Invalid script path!' } - [Boolean]$InputSudo = [Boolean]::Parse($Env:INPUT_OPERATE_SUDO) - If ($InputSudo -and $Env:RUNNER_OS -iin @('Linux', 'MacOS')) { + [Boolean]$InputOperateSudo = [Boolean]::Parse($Env:INPUT_OPERATE_SUDO) + If ($InputOperateSudo -and $Env:RUNNER_OS -iin @('Linux', 'MacOS')) { sudo --non-interactive --preserve-env pwsh -NonInteractive $MainScriptPath } Else { diff --git a/list.json b/list.json index fdbc810..a2274e7 100644 --- a/list.json +++ b/list.json @@ -154,12 +154,7 @@ ], "WMIC": [ "Azure Cosmos DB Emulator", - "Microsoft Azure Authoring Tools", - "Microsoft Azure CLI", - "Microsoft Azure Compute Emulator", - "Microsoft Azure Libraries for .NET", - "Microsoft Azure Service Fabric SDK", - "Microsoft Azure Service Fabric" + "Microsoft Azure*" ], "Env": [ "AZURE_EXTENSION_DIR" @@ -284,12 +279,8 @@ "dotnet" ], "WMIC": [ - "Microsoft .NET 6.0.20 - Windows Server Hosting", - "Microsoft .NET Runtime - 6.0.20 (x64)", - "Microsoft .NET Runtime - 6.0.20 (x86)", - "Microsoft .NET SDK 7.0.306 (x64) from Visual Studio", - "Microsoft ASP.NET Core 6.0.20 - Shared Framework (x64)", - "Microsoft ASP.NET Core 6.0.20 - Shared Framework (x86)" + "Microsoft .NET*", + "Microsoft ASP.NET*" ], "PathLinux": [ "/usr/bin/dotnet", @@ -344,8 +335,7 @@ "firefox" ], "WMIC": [ - "Mozilla Firefox (x64 en-US)", - "Mozilla Maintenance Service" + "Mozilla Firefox*" ], "PathLinux": [ "/usr/lib/firefox-addons", @@ -636,7 +626,7 @@ "temurin-11-jdk" ], "WMIC": [ - "Microsoft Build of OpenJDK with Hotspot 11.0.16.1+1 (x64)" + "Microsoft Build of OpenJDK with Hotspot 11*" ], "Env": [ "JAVA_HOME_11_X64" @@ -892,7 +882,7 @@ "miniconda" ], "WMIC": [ - "Miniconda3 py311_23.5.2-0 (Python 3.11.4 64-bit)" + "Miniconda*" ], "Env": [ "CONDA" @@ -1181,7 +1171,7 @@ "libpq-dev" ], "WMIC": [ - "PostgreSQL 14" + "PostgreSQL*" ], "Env": [ "PGBIN",