Enable Rust in Authentication Package build (gravitational#31094)

Somith11 · Aug 28, 2023 · 7b4c9f4 · 7b4c9f4
1 parent faa84e2
commit 7b4c9f4
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 1 deletion.
diff --git a/.drone.yml b/.drone.yml
@@ -473,6 +473,7 @@ steps:
   - $TeleportSrc = "$Workspace/go/src/github.com/gravitational/teleport"
   - . "$TeleportSrc/build.assets/windows/build.ps1"
   - Enable-Go -ToolchainDir "$Workspace/toolchains"
+  - Enable-Rust -ToolchainDir "$Workspace/toolchains"
   - cd $TeleportSrc
   - $TeleportVersion=$(make print-version).Trim()
   - cd "$TeleportSrc\e\windowsauth"
@@ -751,6 +752,7 @@ steps:
   - $TeleportSrc = "$Workspace/go/src/github.com/gravitational/teleport"
   - . "$TeleportSrc/build.assets/windows/build.ps1"
   - Enable-Go -ToolchainDir "$Workspace/toolchains"
+  - Enable-Rust -ToolchainDir "$Workspace/toolchains"
   - cd $TeleportSrc
   - $TeleportVersion=$(make print-version).Trim()
   - cd "$TeleportSrc\e\windowsauth"
@@ -17119,6 +17121,6 @@ image_pull_secrets:
 - DOCKERHUB_CREDENTIALS
 ---
 kind: signature
-hmac: fe4b25966946166fea1be9a05da31480baa5963de4caf62ae985ff4327b55ce9
+hmac: 38d88cfd48e6bd15c51a7d4bee1acd889330cc78b53720efdf713430702193a1
 
 ...
diff --git a/build.assets/windows/build.ps1 b/build.assets/windows/build.ps1
@@ -145,6 +145,8 @@ function Enable-Rust {
         [string] $ToolchainDir
     )
     begin {
+        $Env:RUSTUP_HOME = "$ToolchainDir/rustup"
+        $Env:CARGO_HOME = "$ToolchainDir/cargo"
         $Env:Path = "$ToolchainDir/cargo/bin;$Env:Path"
     }
 }

diff --git a/dronegen/windows.go b/dronegen/windows.go
@@ -310,6 +310,7 @@ func buildWindowsAuthenticationPackageStep(workspace string) step {
 			`$TeleportSrc = "$Workspace` + teleportSrc + `"`,
 			`. "$TeleportSrc/build.assets/windows/build.ps1"`,
 			`Enable-Go -ToolchainDir "$Workspace` + toolchainDir + `"`,
+			`Enable-Rust -ToolchainDir "$Workspace` + toolchainDir + `"`,
 			`cd $TeleportSrc`,
 			`$TeleportVersion=$(make print-version).Trim()`,
 			`cd "$TeleportSrc\e\windowsauth"`,