chore: support test,tests and script,scripts as aliases (#3373)

Author: mattsse

cli/src/cmd/forge/build/filter.rs

@@ -8,7 +8,7 @@ use std::{convert::Infallible, path::Path, str::FromStr};
 pub struct SkipBuildFilters(pub Vec<SkipBuildFilter>);
 
 impl FileFilter for SkipBuildFilters {
-    /// Only returns a match if no filter a
+    /// Only returns a match if _no_  exclusion filter matches
     fn is_match(&self, file: &Path) -> bool {
         self.0.iter().all(|filter| filter.is_match(file))
     }
@@ -39,8 +39,8 @@ impl SkipBuildFilter {
 impl<T: AsRef<str>> From<T> for SkipBuildFilter {
     fn from(s: T) -> Self {
         match s.as_ref() {
-            "tests" => SkipBuildFilter::Tests,
-            "scripts" => SkipBuildFilter::Scripts,
+            "test" | "tests" => SkipBuildFilter::Tests,
+            "script" | "scripts" => SkipBuildFilter::Scripts,
             s => SkipBuildFilter::Custom(s.to_string()),
         }
     }

cli/src/cmd/forge/build/mod.rs

@@ -72,7 +72,7 @@ pub struct BuildArgs {
         long,
         multiple_values = true,
         action = ArgAction::Append,
-        help = "Skip building whose names contain FILTER. `tests` and `scripts` are aliases for `.t.sol` and `.s.sol`. (this flag can be used multiple times)")]
+        help = "Skip building whose names contain FILTER. `test` and `script` are aliases for `.t.sol` and `.s.sol`. (this flag can be used multiple times)")]
     #[serde(skip)]
     pub skip: Option<Vec<SkipBuildFilter>>,