Skip to content

Commit

Permalink
Periodic update.
Browse files Browse the repository at this point in the history
  • Loading branch information
stephengillie committed Sep 20, 2024
1 parent 587e5ba commit 1c8940d
Show file tree
Hide file tree
Showing 4 changed files with 83 additions and 58 deletions.
6 changes: 4 additions & 2 deletions Tools/ExitCodes.csv
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ Code, Message
-1978335137,Install location must be provided.
-1978335138,The server certificate did not match any of the expected values.
-1978335139,Invalid relative file path to nested installer provided.
-1978335140,Failed to extract archive.
-1978335140,Failed to extract archive. Does the `InstallerUrl` actually end in `.zip` - or does it have a different extension?
-1978335141,Unable to locate nested installer. Does the `RelativeFilePath` have the previous version number in it?
-1978335142,Embedded null characters are disallowed for SQLite
-1978335143,One or more arguments are not supported.
Expand Down Expand Up @@ -194,7 +194,7 @@ Code, Message
14081,The referenced assembly could not be found. Is a dependency missing?
1601,`ERROR_INSTALL_SERVICE_FAILURE` - The Windows Installer Service could not be accessed. This can occur if the Windows Installer is not correctly installed.
1602,`ERROR_INSTALL_USEREXIT` - User cancelled installation.
1603,Install successful but system restart may be required. Should this be add as an `InstallerSuccessCode` or similar?
1603,Previous MSI installer is missing (Or it might mean Install successful but system restart may be required.) Should this be add as an `InstallerSuccessCode` or similar?
1604,`ERROR_INSTALL_SUSPEND` - Installation suspended
1605,`ERROR_UNKNOWN_PRODUCT` - This action is only valid for products that are currently installed.
1606,`ERROR_UNKNOWN_FEATURE` - Feature ID not registered.
Expand Down Expand Up @@ -278,6 +278,8 @@ Code, Message
80072EFD,The operation timed out.
80072EFE,The operation timed out.
80072F76,Network or Firewall Error.
134234117,Resource missing
80004005,Resource missing
80190193,Forbidden (403)
80190194,Not found (404).
80D02002,The operation timed out.
Expand Down
51 changes: 30 additions & 21 deletions Tools/ManualValidationPipeline.cs
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ 17. Status bar (pending)
namespace WinGetApprovalNamespace {
public class WinGetApprovalPipeline : Form {
//vars
public int build = 914;//Get-RebuildPipeApp
public int build = 923;//Get-RebuildPipeApp
public string appName = "WinGetApprovalPipeline";
public string appTitle = "WinGet Approval Pipeline - Build ";
public static string owner = "microsoft";
Expand Down Expand Up @@ -184,7 +184,7 @@ public class WinGetApprovalPipeline : Form {
public static string GitHubBaseUrl = "https://github.com/"+owner+"/"+repo;
public static string GitHubContentBaseUrl = "https://raw.githubusercontent.com/"+owner+"/"+repo;
public static string GitHubApiBaseUrl = "https://api.github.com/repos/"+owner+"/"+repo;
public string ADOMSBaseUrl = "https://dev.azure.com/ms";
public string ADOMSBaseUrl = "https://dev.azure.com/shine-oss";

//ADOLogs - should be refactored to be in-memory.
public static string DestinationPath = MainFolder+"\\Installers";
Expand Down Expand Up @@ -565,13 +565,17 @@ public void drawMenuBar (){
submenu.MenuItems.Add("Update hash 'Specified hash doesn't match.'", new EventHandler(Update_Hash_Action));
submenu.MenuItems.Add("Update hash 2 'SHA256 in manifest...'", new EventHandler(Update_Hash2_Action));
submenu.MenuItems.Add("Update architecture (x64)", new EventHandler(Update_Arch_Action));
item.MenuItems.Add("/azp run", new EventHandler(Retry_Action));
item.MenuItems.Add("@wingetbot run", new EventHandler(Retry_Action));
item.MenuItems.Add("Installs Normally in VM", new EventHandler(Manually_Validated_Action));
item.MenuItems.Add("Close: (User Input);", new EventHandler(Closed_Action));
item.MenuItems.Add("Close: Merge Conflicts;", new EventHandler(Merge_Conflicts_Action));
item.MenuItems.Add("Close: Package still available;", new EventHandler(Package_Available_Action));
item.MenuItems.Add("Close: Regen with new hash;", new EventHandler(Regen_Hash_Action));
item.MenuItems.Add("Close: Duplicate of (User Input);", new EventHandler(Duplicate_Action));
submenu = new MenuItem("Wingetbot Close");
item.MenuItems.Add(submenu);
submenu.MenuItems.Add("Close: Merge Conflicts;", new EventHandler(Merge_Conflicts_Action));
submenu.MenuItems.Add("Close: Regen with new hash;", new EventHandler(Regen_Hash_Action));
submenu = new MenuItem("Regular Close");
item.MenuItems.Add(submenu);
submenu.MenuItems.Add("Close: (User Input);", new EventHandler(Closed_Action));
submenu.MenuItems.Add("Close: Package still available;", new EventHandler(Package_Available_Action));
submenu.MenuItems.Add("Close: Duplicate of (User Input);", new EventHandler(Duplicate_Action));
// item.MenuItems.Add("Add Waiver", new EventHandler(Add_Waiver_Action));
// item.MenuItems.Add("(disabled) Needs Author Feedback (reason)", new EventHandler(Needs_Author_Feedback_Action));
// submenu = new MenuItem("Canned Replies");
Expand Down Expand Up @@ -1573,8 +1577,7 @@ public void LabelAction(int PR){
ReplyToPR(PR,"SequenceNoElements");
string PRTitle = FromJson(InvokeGitHubPRRequest(PR))["title"];
if ((PRTitle.Contains("Automatic deletion")) || (PRTitle.Contains("Remove"))) {

ReplyToPR(PR,"","","Manually-Validated","This package installs and launches normally on a Windows 10 VM.");
ReplyToPR(PR,"InstallsNormally","","Manually-Validated");
}
}
}
Expand Down Expand Up @@ -1836,10 +1839,14 @@ public dynamic SearchGitHub(string Preset, int Page = 1,int Days = 0,bool IEDS =
Review2 += "-"+string_NAF;
Review2 += "-label:Needs-Review+";

string Workable = "-label:Validation-Merge-Conflict+";
string Workable = "-label:Highest-Version-Removal+";
Workable += "-label:Manifest-Version-Error+";
Workable += "-label:Validation-Certificate-Root+";
Workable += "-label:Binary-Validation-Error+";
Workable += "-label:Validation-Merge-Conflict+";
Workable += "-label:Validation-SmartScreen-Error+";
Workable += "-label:Unexpected-File+";
Workable += "-label:Highest-Version-Removal+";


//Composite settings;
string Set1 = Blocking + Common + Review1;
string Set2 = Set1 + Review2;
Expand Down Expand Up @@ -1869,7 +1876,8 @@ public dynamic SearchGitHub(string Preset, int Page = 1,int Days = 0,bool IEDS =
if (Preset == "Approval") {
Url += Cna;
Url += Set2; //Blocking + Common + Review1 + Review2;
Url += Workable;
Url += Workable;
Url += " sort:created-asc";
} else if (Preset == "Defender") {
Url += Defender;
Url += "sort:updated-asc+";
Expand Down Expand Up @@ -1911,9 +1919,9 @@ public string CannedMessage (string Message, string UserInput = "") {
if (Message == "AgreementMismatch"){
string_out = greeting + "This package uses Agreements, but this PR's AgreementsUrl doesn't match the AgreementsUrl on file.";
} else if (Message == "AppsAndFeaturesNew"){
string_out = greeting + "This manifest adds Apps and Features entries that aren't present in previous PR versions. These entries should be added to the previous versions, or removed from this version.";
string_out = greeting + "This manifest adds Apps and Features entries that aren't present in previous PR versions. This entry should be added to the previous versions, or removed from this version.";
} else if (Message == "AppsAndFeaturesMissing"){
string_out = greeting + "This manifest removes Apps and Features entries that are present in previous PR versions. These entries should be added to this version, to maintain version matching, and prevent the 'upgrade always available' situation with this package.";
string_out = greeting + "This manifest removes Apps and Features entries that are present in previous PR versions. This entry should be added to this version, to maintain version matching, and prevent the 'upgrade always available' situation with this package.";
} else if (Message == "AppFail"){
string_out = greeting + "The application installed normally, but gave an error instead of launching:" + Environment.NewLine;
} else if (Message == "Approve"){
Expand All @@ -1937,7 +1945,7 @@ public string CannedMessage (string Message, string UserInput = "") {
} else if (Message == "InstallerNotSilent"){
string_out = greeting + "The installation isn't unattended. Is there an installer switch to have the package install silently?";
} else if (Message == "InstallsNormally"){
string_out = greeting + "This package installs and launches normally on a Windows 10 VM.";
string_out = "This package installs and launches normally in a Windows 10 VM.";
} else if (Message == "ListingDiff"){
string_out = "This PR omits these files that are present in the current manifest:" + Environment.NewLine + "> " + UserInput;
} else if (Message == "ManifestVersion"){
Expand All @@ -1953,7 +1961,7 @@ public string CannedMessage (string Message, string UserInput = "") {
} else if (Message == "NotGoodFit"){
string_out = greeting + "Unfortunately, this package might not be a good fit for inclusion into the WinGet public manifests. Please consider using a local manifest (\\WinGet install --manifest C:\\path\\to\\manifest\\files\\) for local installations. ";
} else if (Message == "NormalInstall"){
string_out = "This package installs and launches normally on a Windows 10 VM.";
string_out = "This package installs and launches normally in a Windows 10 VM.";
} else if (Message == "OneManifestPerPR"){
string_out = greeting + "We have a limit of 1 manifest change, addition, or removal per PR. This PR modifies more than one PR. Can these changes be spread across multiple PRs?";
} else if (Message == "Only64bit"){
Expand Down Expand Up @@ -2171,7 +2179,7 @@ public string ApprovePR(int PR,string Data = "") {

public string RetryPR(int PR) {
AddPRToRecord(PR,"Retry");
return InvokeGitHubPRRequest(PR,WebRequestMethods.Http.Post,"comments","/azp run");
return InvokeGitHubPRRequest(PR,WebRequestMethods.Http.Post,"comments","@wingetbot run");
}

public string AddGitHubReviewComment(int PR, string Comment,int? StartLine,int Line) {
Expand Down Expand Up @@ -4720,7 +4728,7 @@ public void Retry_Action(object sender, EventArgs e) {

public void Manually_Validated_Action(object sender, EventArgs e) {
int PR = GetCurrentPR();
string response_out = ReplyToPR(PR,"InstallsNormally","Manually-Validated");
string response_out = ReplyToPR(PR,"InstallsNormally","","Manually-Validated");
AddPRToRecord(PR,"Manual");
}// end Manually_Validated_Action
//Modify PR - Close PR
Expand Down Expand Up @@ -5065,7 +5073,8 @@ public void Idle_Action(object sender, EventArgs e) {
"The package didn't pass a Defender or similar security scan",//My automation - DefenderFail.
"Installer failed security check",//My automation - AutoValLog DefenderFail.
"Sequence contains no elements",//New Sequence error.
"Missing Properties value based on version"//New property detection.
"Missing Properties value based on version",//New property detection.
"Azure Pipelines could not run because the pipeline triggers exclude this branch/path"//Pipeline error.
};

public string[] WordFilterList = {
Expand Down
1 change: 1 addition & 0 deletions Tools/ManualValidationPipeline.csv
Original file line number Diff line number Diff line change
Expand Up @@ -248,6 +248,7 @@
"Taozuhong.Kangaroo","taozuhong","should","manual","","","","","","","",
"Tauri.create-tauri-app","SpecterShell","should","manual","","","","","","","",
"TechPowerUp.GPU-Z","","","","","","0","","0","0","","Don't process removals. Host only allows package manager user agents to download."
"Tonec.InternetDownloadManager","","","","","","0","","0","0","","Adds patch versions as duplicates of the latest build version. https://github.com/microsoft/winget-pkgs/issues/128340"
"Telegram.TelegramDesktop","","","","","MaanuelMM","","","","","",
"Tencent.Foxmail","","","","Validation-Domain","","0","","0","0","",""
"Tgstation.Server","Cyberboss","should","manual","","","","","","","",
Expand Down
Loading

0 comments on commit 1c8940d

Please sign in to comment.