fix(ci): windows stuffs

zucchero-sintattico · Mar 15, 2024 · 417cc58 · 417cc58
1 parent 1fdcc52
commit 417cc58
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 14 deletions.
diff --git a/.github/workflows/build-and-deploy.yml b/.github/workflows/build-and-deploy.yml
@@ -3,10 +3,6 @@ on:
   workflow_call:
   workflow_dispatch:
 
-defaults:
-  run:
-    shell: bash
-
 jobs:
   build:
     strategy:
@@ -20,11 +16,6 @@ jobs:
     steps:
       - name: Checkout
         uses: DanySK/action-checkout@0.2.14
-      - uses: actions/setup-node@v4
-        if: matrix.os == 'windows-2022'
-        with:
-          node-version: 18
-          cache: 'npm'
       - uses: DanySK/build-check-deploy-gradle-action@2.4.8
         env:
           CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}

diff --git a/src/main/kotlin/io/github/zuccherosintattico/utils/NpmCommandsExtension.kt b/src/main/kotlin/io/github/zuccherosintattico/utils/NpmCommandsExtension.kt
@@ -7,6 +7,16 @@ import com.lordcodes.turtle.ShellScript
  */
 object NpmCommandsExtension {
 
+    private fun String.cmdIfOnWindows(): String = System.getProperty("os.name").let { os ->
+        when {
+            os.contains("Windows") -> "$this.cmd"
+            else -> this
+        }
+    }
+
+    private val npmCommand: String = "npm".cmdIfOnWindows()
+    private val npxCommand: String = "npx".cmdIfOnWindows()
+
     /**
      * Install the dependencies.
      */
@@ -15,10 +25,10 @@ object NpmCommandsExtension {
     /**
      * Run the NPM command.
      */
-    fun ShellScript.npmCommand(vararg arguments: String): String = command("npm", arguments.toList())
+    fun ShellScript.npmCommand(vararg arguments: String): String = command(npmCommand, arguments.toList())
 
     /**
      * Run the NPX command.
      */
-    fun ShellScript.npxCommand(vararg arguments: String): String = command("npx", arguments.toList())
+    fun ShellScript.npxCommand(vararg arguments: String): String = command(npxCommand, arguments.toList())
 }
diff --git a/src/test/kotlin/io/github/zuccherosintattico/gradle/TypescriptPluginTest.kt b/src/test/kotlin/io/github/zuccherosintattico/gradle/TypescriptPluginTest.kt
@@ -45,19 +45,19 @@ class TypescriptPluginTest : AnnotationSpec() {
             build()
         }
 
-    private fun Path.stringWalk(): List<String> = toFile().walk().map { it.relativeTo(toFile()).toString() }.toList()
+    private fun Path.walkRelative(): List<File> = toFile().walk().map { it.relativeTo(toFile()) }.toList()
 
     @Test
     fun `test base configuration`() {
         val testFolder = getTempDirectoryWithResources()
         testFolder.executeGradleTask("compileTypescript", "--stacktrace")
 
-        testFolder.stringWalk() shouldContainAll listOf(
+        testFolder.walkRelative() shouldContainAll listOf(
             "build/dist",
             "build/dist/index.js",
             "build/dist/person.js",
             "node_modules",
             "package-lock.json",
-        )
+        ).map { File(it) }
     }
 }