Merge pull request #479 from dscho/use-agents-git

Prefer the build agent's copy of Git, fix `save-state` warning

Author: dscho

dist/index.js

@@ -9,7 +9,6 @@ import {
   gitForWindowsUsrBinPath
 } from './src/git'
 import * as fs from 'fs'
-import * as coreCommand from '@actions/core/lib/command'
 
 const flavor = core.getInput('flavor')
 const architecture = core.getInput('architecture')
@@ -252,16 +251,16 @@ function cleanup(): void {
 /**
  * Indicates whether the POST action is running
  */
-export const isPost = !!process.env['STATE_isPost']
+export const isPost = !!core.getState('isPost')
 
 if (!isPost) {
   run()
   /*
    * Publish a variable so that when the POST action runs, it can determine it should run the cleanup logic.
    * This is necessary since we don't have a separate entry point.
-   * Inspired by https://github.com/actions/checkout/blob/v3.0.2/src/state-helper.ts#L69-L71
+   * Inspired by https://github.com/actions/checkout/blob/v3.1.0/src/state-helper.ts#L56-L60
    */
-  coreCommand.issueCommand('save-state', {name: 'isPost'}, 'true')
+  core.saveState('isPost', 'true')
 } else {
   // If the POST action is running, we cleanup our artifacts
   cleanup()

dist/index.js.map

@@ -4,8 +4,15 @@ import {Octokit} from '@octokit/rest'
 import {delimiter} from 'path'
 import * as fs from 'fs'
 
-export const gitForWindowsUsrBinPath = 'C:/Program Files/Git/usr/bin'
-const gitExePath = 'C:/Program Files/Git/cmd/git.exe'
+// If present, do prefer the build agent's copy of Git
+const externalsGitDir = `${process.env.AGENT_HOMEDIRECTORY}/externals/git`
+const gitForWindowsRoot = 'C:/Program Files/Git'
+const gitRoot = fs.existsSync(externalsGitDir)
+  ? externalsGitDir
+  : gitForWindowsRoot
+
+export const gitForWindowsUsrBinPath = `${gitRoot}/usr/bin`
+const gitExePath = `${gitRoot}/cmd/git.exe`
 
 /*
  * It looks a bit ridiculous to use 56 workers on a build agent that has only