From 8a9e20a5860cb7f6b3a1d92a74799581e054d850 Mon Sep 17 00:00:00 2001 From: Matthias Pigulla Date: Wed, 19 Oct 2022 14:55:54 +0200 Subject: [PATCH] Fix path to `git` binary on Windows runners (#140) This PR fixes an apparently wrong path to the `git` binary that was added in #136. According to https://github.com/actions/checkout/discussions/928#discussioncomment-3861581, the path should not contain the `usr/` part, although for `ssh-add` and `ssh-agent`, it has to. --- dist/cleanup.js | 2 +- dist/index.js | 2 +- paths.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dist/cleanup.js b/dist/cleanup.js index f978a12..8af40c8 100644 --- a/dist/cleanup.js +++ b/dist/cleanup.js @@ -2835,7 +2835,7 @@ module.exports = (process.env['OS'] != 'Windows_NT') ? { homePath: os.homedir(), sshAgentCmd: 'c://progra~1//git//usr//bin//ssh-agent.exe', sshAddCmd: 'c://progra~1//git//usr//bin//ssh-add.exe', - gitCmd: 'c://progra~1//git//usr//bin//git.exe' + gitCmd: 'c://progra~1//git//bin//git.exe' }; diff --git a/dist/index.js b/dist/index.js index 3326288..3039a0b 100644 --- a/dist/index.js +++ b/dist/index.js @@ -2914,7 +2914,7 @@ module.exports = (process.env['OS'] != 'Windows_NT') ? { homePath: os.homedir(), sshAgentCmd: 'c://progra~1//git//usr//bin//ssh-agent.exe', sshAddCmd: 'c://progra~1//git//usr//bin//ssh-add.exe', - gitCmd: 'c://progra~1//git//usr//bin//git.exe' + gitCmd: 'c://progra~1//git//bin//git.exe' }; diff --git a/paths.js b/paths.js index edeb197..fa2c366 100644 --- a/paths.js +++ b/paths.js @@ -12,5 +12,5 @@ module.exports = (process.env['OS'] != 'Windows_NT') ? { homePath: os.homedir(), sshAgentCmd: 'c://progra~1//git//usr//bin//ssh-agent.exe', sshAddCmd: 'c://progra~1//git//usr//bin//ssh-add.exe', - gitCmd: 'c://progra~1//git//usr//bin//git.exe' + gitCmd: 'c://progra~1//git//bin//git.exe' };