mirror of
				https://github.com/actions-rs/toolchain.git
				synced 2025-10-31 16:53:53 +00:00 
			
		
		
		
	Merge e80cf306a4a2376f1a804ce29fce47c5a937e136 into 88dc2356392166efad76775c878094f4e83ff746
This commit is contained in:
		
						commit
						8309a9455a
					
				| @ -28,6 +28,8 @@ inputs: | ||||
|   components: | ||||
|     description: Comma-separated list of components to be additionally installed for a new toolchain | ||||
|     required: false | ||||
|   working-directory: | ||||
|     description: Working directory to use for finding rust-toolchain | ||||
| 
 | ||||
| outputs: | ||||
|   rustc: | ||||
|  | ||||
							
								
								
									
										2
									
								
								dist/index.js
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								dist/index.js
									
									
									
									
										vendored
									
									
								
							
										
											
												File diff suppressed because one or more lines are too long
											
										
									
								
							
							
								
								
									
										10165
									
								
								package-lock.json
									
									
									
										generated
									
									
									
								
							
							
						
						
									
										10165
									
								
								package-lock.json
									
									
									
										generated
									
									
									
								
							
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							| @ -35,6 +35,13 @@ function determineToolchain(overrideFile: string): string { | ||||
|     return rustToolchainFile; | ||||
| } | ||||
| 
 | ||||
| export function setWorkingDirectory() { | ||||
|     const workingDirectory = input.getInput("working-directory"); | ||||
|     if (workingDirectory) { | ||||
|         process.chdir(workingDirectory); | ||||
|     } | ||||
| } | ||||
| 
 | ||||
| export function getToolchainArgs(overrideFile: string): ToolchainOptions { | ||||
|     let components: string[] | undefined = input.getInputList("components"); | ||||
|     if (components && components.length === 0) { | ||||
|  | ||||
| @ -6,6 +6,7 @@ import * as versions from "./versions"; | ||||
| import { RustUp, ToolchainOptions } from "@actions-rs/core"; | ||||
| 
 | ||||
| async function run(): Promise<void> { | ||||
|     args.setWorkingDirectory(); | ||||
|     // we use path.join to make sure this works on Windows, Linux and MacOS
 | ||||
|     const toolchainOverridePath = path.join(process.cwd(), "rust-toolchain"); | ||||
| 
 | ||||
|  | ||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user