.

lolgab · Jan 13, 2025 · 859e20d · 859e20d
1 parent f251291
commit 859e20d
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 10 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -47,8 +47,8 @@ jobs:
           ./mill --disable-ticker integration.test
       - name: Start NGINX Unit daemon
         run: sudo systemctl start unit.service
-      # - name: Run Mill Plugin Tests
-      #   run: ./mill --disable-ticker snunit-mill-plugin-itest.__.test
+      - name: Run Mill Plugin Tests
+        run: ./mill --disable-ticker snunit-mill-plugin.__.test
       # - name: Build and Test Sbt plugin
       #   run: |
       #     (

diff --git a/build.mill.scala b/build.mill.scala
@@ -34,8 +34,6 @@ val testServerPort = 8081
 object Common {
   trait Shared extends ScalaModule with ScalafixModule {
     def organization = "com.github.lolgab"
-    def name = "snunit"
-    def crossScalaVersion: String
 
     def scalacOptions = super.scalacOptions() ++
       Seq("-deprecation")
@@ -261,7 +259,7 @@ object integration extends ScalaModule {
   }
 }
 
-object `snunit-mill-plugin` extends ScalaModule with Publish with BuildInfo {
+object `snunit-mill-plugin` extends Common.Shared with Publish with BuildInfo {
   def buildInfoMembers = Seq(
     BuildInfo.Value("snunitVersion", publishVersion())
   )

diff --git a/snunit-mill-plugin/src/snunit/plugin/SNUnit.scala b/snunit-mill-plugin/src/snunit/plugin/SNUnit.scala
@@ -17,12 +17,12 @@ trait SNUnit extends ScalaNativeModule {
   }
 
   def snunitNGINXUnitBinary = Task {
-    val platform = System.getProperty("os.name", "unknown")
+    val platform = System.getProperty("os.name", "unknown").toLowerCase()
 
     val openSslParams =
-      if (platform.contains("mac"))
+      if (platform.contains("mac")) {
         List("--cc-opt=-I/opt/homebrew/opt/openssl@3/include", "--ld-opt=-L/opt/homebrew/opt/openssl@3/lib")
-      else Nil
+      } else Nil
 
     // val unitDir = snunitNGINXUnitSources().path
     val unitDir = os.Path("/Users/lorenzo/unit")

diff --git a/snunit-mill-plugin/test/src/snunit/plugin/SNUnitTests.scala b/snunit-mill-plugin/test/src/snunit/plugin/SNUnitTests.scala
@@ -17,11 +17,11 @@ object SNUnitTests extends TestSuite {
       val resourceFolder = os.Path(sys.env("MILL_TEST_RESOURCE_DIR").split(";").head)
 
       UnitTester(build, resourceFolder / "simple").scoped { eval =>
-        scala.concurrent.ExecutionContext.global.execute(() => eval(build.snunitRunNGINXUnit))
+        scala.concurrent.ExecutionContext.global.execute(() => eval(build.snunitRunNGINXUnit()))
         var started = false
         while (!started) {
           try {
-            val response = requests.get("http://127.0.0.1:8080", check = false).text
+            val response = requests.get("http://127.0.0.1:8080", check = false).text()
             started = true
             response ==> "TEST SNUnit Mill Plugin"
           } catch {