2452: Client CLI build fails on Windows

Reviewed-by: ihse

Author: erikj79

.github/workflows/ci.yml

@@ -79,7 +79,7 @@ jobs:
           ${{ needs.prerequisites.outputs.merge_target_command }}
 
       - name: Build and test
-        run: sh gradlew test --info --stacktrace
+        run: sh gradlew test local --info --stacktrace
 
   mac:
     name: macOS x64
@@ -101,7 +101,7 @@ jobs:
         run: brew install mercurial
 
       - name: Build and test
-        run: sh gradlew test --info --stacktrace
+        run: sh gradlew test local --info --stacktrace
 
   win:
     name: Windows x64
@@ -120,5 +120,5 @@ jobs:
           ${{ needs.prerequisites.outputs.merge_target_command }}
 
       - name: Build and test
-        run: gradlew.bat test --info --stacktrace
+        run: gradlew.bat test local --info --stacktrace
         shell: cmd

build.gradle

@@ -184,7 +184,7 @@ def getCPU() {
 
 task local(type: Copy) {
     doFirst {
-        delete project.buildDir
+        delete project.buildDir.toString() + '/cli'
     }
 
     def os = getOS()
@@ -202,7 +202,7 @@ task local(type: Copy) {
                       '/cli/build/distributions/cli' +
                       '-' + project.version + '-' +
                       os + '-' + cpu + '.zip'))
-    into project.buildDir
+    into project.buildDir.toString() + '/cli'
 }
 
 task bots(type: Copy) {

skara.sh

@@ -37,9 +37,9 @@ else
 
 fi
 
-if [ -d "${DIR}/build" ]; then
+if [ -d "${DIR}/build/cli" ]; then
     rm -rf "${DIR}/bin"
-    mv "${DIR}/build" "${DIR}/bin"
+    mv "${DIR}/build/cli" "${DIR}/bin"
 fi
 
 if [ "${OS}" = "Linux" -o "${OS}" = "Darwin" ]; then