Merge pull request #737 from openziti/update-ziti-cli

Update ziti-cli to version 1.6.9

Author: ekoby

gradle/libs.versions.toml

@@ -11,7 +11,7 @@ download = "5.6.0"
 
 # OpenZiti Edge API
 ziti-api = "0.26.51"
-ziti-cli = "1.5.4"
+ziti-cli = "1.6.9"
 
 # third party
 lazysodium-java = "5.2.0"

ziti/build.gradle.kts

@@ -150,16 +150,33 @@ kotlin {
 
 val zitiVersion = libs.versions.ziti.cli.get()
 val binDir = layout.buildDirectory.dir("bin").get()
+val srcDir = layout.buildDirectory.dir("ziti-src").get()
 val zitiCLI = binDir.file("ziti")
 val quickstartHome = layout.buildDirectory.dir("quickstart").get()
 
+tasks.register<Exec>("zitiCheckout") {
+    group = LifecycleBasePlugin.BUILD_GROUP
+    description = "checkout ziti cli source"
+
+    if (srcDir.asFile.exists()) {
+        srcDir.asFile.deleteRecursively()
+    }
+
+    commandLine("env", "git", "clone",
+        "--depth", "1", "--branch", "v${zitiVersion}",
+        "https://github.com/openziti/ziti", "${srcDir.asFile.absolutePath}"
+    )
+}
+
 tasks.register<Exec>("buildZiti") {
+    dependsOn("zitiCheckout")
     group = LifecycleBasePlugin.BUILD_GROUP
     description = "Builds the Ziti CLI"
+    workingDir(srcDir)
+
     environment("GOBIN", binDir.asFile.absolutePath)
-    commandLine("env",
-        "go", "install", "github.com/openziti/ziti/ziti@v${zitiVersion}"
-    )
+    environment("GOWORK", "off")
+    commandLine("env", "go", "install", "./ziti")
     outputs.file(zitiCLI)
 }