fix .NET in GitHub actions

Author: Aloso

.github/workflows/test.yml

@@ -34,15 +34,6 @@ jobs:
         with:
           components: clippy
 
-      - name: ⚡ Cache
-        uses: actions/cache@v4
-        with:
-          path: |
-            ~/.cargo/registry
-            ~/.cargo/git
-            target
-          key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
-
       - name: Clippy
         uses: actions-rs/clippy-check@v1
         with:
@@ -68,18 +59,19 @@ jobs:
 
       - name: Setup .NET
         uses: actions/setup-dotnet@v5
-        if: ${{ matrix.os == 'ubuntu-latest' }}
         with:
           dotnet-version: '8.x.x'
 
+      - name: Install dotnet-script
+        run: |
+          dotnet tool install --global dotnet-script
+          echo "$HOME/.dotnet/tools" >> $GITHUB_PATH
+
       - name: Setup Deno
         uses: denoland/setup-deno@v1
         with:
           deno-version: v1.x
 
-      - name: Cache
-        uses: Swatinem/rust-cache@v2
-
       - name: Build and run tests
         run: env PCRE2_SYS_STATIC=1 cargo test
 

pomsky-lib/afl-fuzz/README.md

@@ -7,7 +7,7 @@ The latter requirement is tested by compiling the regex with the respective rege
 - deno (for JavaScript)
 - javac
 - python
-- mcs (for .NET)
+- dotnet-script (for .NET)
 
 ## Usage
 

pomsky-lib/tests/it/files.rs

@@ -118,11 +118,7 @@ impl Options {
 
 fn can_compile_regex(flavor: RegexFlavor) -> bool {
     use RegexFlavor::*;
-    #[cfg(target_os = "linux")]
-    if flavor == DotNet {
-        return true;
-    }
-    matches!(flavor, Rust | Pcre | Ruby | JavaScript | Java | Python)
+    matches!(flavor, Rust | Pcre | Ruby | JavaScript | Java | Python | DotNet)
 }
 
 #[derive(Clone, Copy, Debug)]
@@ -227,7 +223,6 @@ pub(crate) fn test_file(
                             RegexFlavor::JavaScript => proc.test_js(regex),
                             RegexFlavor::Java => proc.test_java(regex),
                             RegexFlavor::Python => proc.test_python(regex),
-                            #[cfg(target_os = "linux")]
                             RegexFlavor::DotNet => proc.test_dotnet(regex),
                             _ => {
                                 eprintln!(

pomsky-lib/tests/it/main.rs

@@ -125,8 +125,6 @@ fn defer_main() {
         eprintln!("  Ruby   was invoked {} times", rt.ruby.get_count());
         eprintln!("  Rust   was invoked {} times", rt.rust.get_count());
         eprintln!("  PCRE   was invoked {} times", rt.pcre.get_count());
-
-        #[cfg(target_os = "linux")]
         eprintln!("  .NET   was invoked {} times", rt.dotnet.get_count());
     }
 

regex-test/dotnet/TesterAsync.cs

@@ -1,32 +1,28 @@
 using System;
 using System.Text.RegularExpressions;
 
-public class TesterAsync {
-    public static void Main(string[] args) {
-        string line;
-        string testLine;
+string line;
+string testLine;
 
-        while ((line = Console.ReadLine()) != null) {
-            if (!line.StartsWith("REGEX:")) {
-                continue;
-            }
+while ((line = Console.ReadLine()) != null) {
+    if (!line.StartsWith("REGEX:")) {
+        continue;
+    }
 
-            try {
-                var r = new Regex(line.Substring(6), RegexOptions.Compiled);
-                Console.WriteLine("success");
+    try {
+        var r = new Regex(line.Substring(6), RegexOptions.Compiled);
+        Console.WriteLine("success");
 
-                while ((testLine = Console.ReadLine()) != null && testLine.StartsWith("TEST:")) {
-                    var test = testLine.Substring(5);
-                    if (r.IsMatch(test)) {
-                        Console.WriteLine("test good");
-                    } else {
-                        throw new ArgumentException($"Regex '{r}' does not match '{test}'");
-                    }
-                }
-            } catch (ArgumentException e) {
-                string message = e.Message.Replace("\\", @"\\").Replace("\n", @"\n");
-                Console.WriteLine(message);
+        while ((testLine = Console.ReadLine()) != null && testLine.StartsWith("TEST:")) {
+            var test = testLine.Substring(5);
+            if (r.IsMatch(test)) {
+                Console.WriteLine("test good");
+            } else {
+                throw new ArgumentException($"Regex '{r}' does not match '{test}'");
             }
         }
+    } catch (ArgumentException e) {
+        string message = e.Message.Replace("\\", @"\\").Replace("\n", @"\n");
+        Console.WriteLine(message);
     }
 }

regex-test/src/sync/mod.rs

@@ -12,7 +12,6 @@ pub struct RegexTest {
     pub js: Process,
     pub java: Process,
     pub py: Process,
-    #[cfg(target_os = "linux")]
     pub dotnet: Process,
     pub rust: Count,
     pub pcre: Count,
@@ -29,23 +28,18 @@ impl RegexTest {
             scope.spawn(|| self.test_js("x"));
             scope.spawn(|| self.test_java("x"));
             scope.spawn(|| self.test_python("x"));
-
-            #[cfg(target_os = "linux")]
             scope.spawn(|| self.test_dotnet("x"));
         });
         self.js.reset_count();
         self.java.reset_count();
         self.py.reset_count();
-
-        #[cfg(target_os = "linux")]
         self.dotnet.reset_count();
     }
 
     pub fn kill_processes(&self) -> io::Result<()> {
         self.js.kill()?;
         self.py.kill()?;
         self.java.kill()?;
-        #[cfg(target_os = "linux")]
         self.dotnet.kill()?;
         Ok(())
     }
@@ -118,27 +112,12 @@ impl RegexTest {
         self.java.test(regex, tests)
     }
 
-    #[cfg(target_os = "linux")]
     pub fn test_dotnet(&self, regex: impl AsRef<str>) -> Outcome {
         self.test_dotnet_with(regex, &[] as &[&str])
     }
 
-    #[cfg(target_os = "linux")]
     pub fn test_dotnet_with(&self, regex: impl AsRef<str>, tests: &[impl AsRef<str>]) -> Outcome {
-        self.dotnet.start_with("dotnet", "mono", &["TesterAsync.exe"], || {
-            let compiled = concat!(env!("CARGO_MANIFEST_DIR"), "/dotnet/TesterAsync.exe");
-            if !Path::new(compiled).exists() {
-                let result = Command::new("mcs")
-                    .current_dir(concat!(env!("CARGO_MANIFEST_DIR"), "/dotnet"))
-                    .arg("TesterAsync.cs")
-                    .output()
-                    .expect(
-                        "`mcs` executable not found, required for running .NET regex flavor tests",
-                    );
-                assert!(result.status.success(), "Could not compile C# file");
-            }
-        });
-
+        self.dotnet.start("dotnet", "dotnet-script", &["TesterAsync.cs"]);
         self.dotnet.test(regex, tests)
     }
 }