diff --git a/dist/index.js b/dist/index.js index 17940603..62556407 100644 Binary files a/dist/index.js and b/dist/index.js differ diff --git a/dist/index.js.map b/dist/index.js.map index eaf9a0bd..356d01f9 100644 Binary files a/dist/index.js.map and b/dist/index.js.map differ diff --git a/dist/platforms/ubuntu/steps/set_gitcredential.sh b/dist/platforms/ubuntu/steps/set_gitcredential.sh index 6c8de5d9..1015f654 100755 --- a/dist/platforms/ubuntu/steps/set_gitcredential.sh +++ b/dist/platforms/ubuntu/steps/set_gitcredential.sh @@ -7,8 +7,8 @@ else echo "GIT_PRIVATE_TOKEN is set configuring git credentials" git config --global credential.helper store - git config --global --replace-all url.https://github.com/.insteadOf ssh://git@github.com/ - git config --global --add url.https://github.com/.insteadOf git@github.com + git config --global --replace-all url."https://token:$GIT_PRIVATE_TOKEN@github.com/".insteadOf ssh://git@github.com/ + git config --global --add url."https://token:$GIT_PRIVATE_TOKEN@github.com/".insteadOf git@github.com git config --global url."https://token:$GIT_PRIVATE_TOKEN@github.com/".insteadOf "https://github.com/" git config --global url."https://ssh:$GIT_PRIVATE_TOKEN@github.com/".insteadOf "ssh://git@github.com/" diff --git a/src/model/docker.ts b/src/model/docker.ts index 78d22071..acafff56 100644 --- a/src/model/docker.ts +++ b/src/model/docker.ts @@ -17,7 +17,7 @@ class Docker { } static getLinuxCommand(image, parameters): string { - const { workspace, actionFolder, runnerTempPath, sshAgent } = parameters; + const { workspace, actionFolder, runnerTempPath, sshAgent, gitPrivateToken } = parameters; const githubHome = path.join(runnerTempPath, '_github_home'); if (!existsSync(githubHome)) mkdirSync(githubHome); @@ -30,6 +30,7 @@ class Docker { ${ImageEnvironmentFactory.getEnvVarString(parameters)} \ --env UNITY_SERIAL \ --env GITHUB_WORKSPACE=/github/workspace \ + ${gitPrivateToken ? `--env GIT_PRIVATE_TOKEN="${gitPrivateToken}"` : ''} \ ${sshAgent ? '--env SSH_AUTH_SOCK=/ssh-agent' : ''} \ --volume "${githubHome}":"/root:z" \ --volume "${githubWorkflow}":"/github/workflow:z" \ @@ -44,13 +45,14 @@ class Docker { } static getWindowsCommand(image: any, parameters: any): string { - const { workspace, actionFolder, unitySerial } = parameters; + const { workspace, actionFolder, unitySerial, gitPrivateToken } = parameters; return `docker run \ --workdir /github/workspace \ --rm \ ${ImageEnvironmentFactory.getEnvVarString(parameters)} \ --env UNITY_SERIAL="${unitySerial}" \ --env GITHUB_WORKSPACE=c:/github/workspace \ + ${gitPrivateToken ? `--env GIT_PRIVATE_TOKEN="${gitPrivateToken}"` : ''} \ --volume "${workspace}":"c:/github/workspace" \ --volume "c:/regkeys":"c:/regkeys" \ --volume "C:/Program Files (x86)/Microsoft Visual Studio":"C:/Program Files (x86)/Microsoft Visual Studio" \