mirror of
https://github.com/webfactory/ssh-agent.git
synced 2025-04-24 23:12:13 +00:00
Merge 72bad59e39
into fd34b8dee2
This commit is contained in:
commit
011d961217
3 changed files with 36 additions and 27 deletions
11
.github/workflows/demo.yml
vendored
11
.github/workflows/demo.yml
vendored
|
@ -9,12 +9,14 @@ jobs:
|
|||
runs-on: ${{ matrix.os }}
|
||||
steps:
|
||||
- uses: actions/checkout@v3
|
||||
- name: Setup key
|
||||
- name: Setup first key
|
||||
uses: ./
|
||||
with:
|
||||
ssh-private-key: |
|
||||
${{ secrets.MPDUDE_TEST_1_DEPLOY_KEY }}
|
||||
${{ secrets.MPDUDE_TEST_2_DEPLOY_KEY }}
|
||||
ssh-private-key: ${{ secrets.MPDUDE_TEST_1_DEPLOY_KEY }}
|
||||
- name: Setup second key
|
||||
uses: ./
|
||||
with:
|
||||
ssh-private-key: ${{ secrets.MPDUDE_TEST_2_DEPLOY_KEY }}
|
||||
- run: |
|
||||
git clone https://github.com/mpdude/test-1.git test-1-http
|
||||
git clone git@github.com:mpdude/test-1.git test-1-git
|
||||
|
@ -43,4 +45,3 @@ jobs:
|
|||
git clone https://github.com/mpdude/test-2.git test-2-http
|
||||
git clone git@github.com:mpdude/test-2.git test-2-git
|
||||
git clone ssh://git@github.com/mpdude/test-2.git test-2-git-ssh
|
||||
|
||||
|
|
12
dist/index.js
vendored
12
dist/index.js
vendored
|
@ -361,21 +361,25 @@ try {
|
|||
const homeSsh = homePath + '/.ssh';
|
||||
fs.mkdirSync(homeSsh, { recursive: true });
|
||||
|
||||
console.log("Starting ssh-agent");
|
||||
|
||||
const authSock = core.getInput('ssh-auth-sock');
|
||||
const sshAgentArgs = (authSock && authSock.length > 0) ? ['-a', authSock] : [];
|
||||
|
||||
if (child_process.spawnSync(sshAdd, ['-l'], { env: { ...process.env, SSH_AUTH_SOCK: authSock || process.env.SSH_AUTH_SOCK } }).status === 0) {
|
||||
console.log('ssh-agent is already running, not starting a new one');
|
||||
} else {
|
||||
console.log("Starting ssh-agent");
|
||||
|
||||
// Extract auth socket path and agent pid and set them as job variables
|
||||
child_process.execFileSync(sshAgentCmd, sshAgentArgs).toString().split("\n").forEach(function(line) {
|
||||
child_process.execFileSync(sshAgent, sshAgentArgs).toString().split("\n").forEach(function(line) {
|
||||
const matches = /^(SSH_AUTH_SOCK|SSH_AGENT_PID)=(.*); export \1/.exec(line);
|
||||
|
||||
if (matches && matches.length > 0) {
|
||||
// This will also set process.env accordingly, so changes take effect for this script
|
||||
core.exportVariable(matches[1], matches[2])
|
||||
core.exportVariable(matches[1], matches[2]);
|
||||
console.log(`${matches[1]}=${matches[2]}`);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
console.log("Adding private key(s) to agent");
|
||||
|
||||
|
|
12
index.js
12
index.js
|
@ -25,21 +25,25 @@ try {
|
|||
const homeSsh = homePath + '/.ssh';
|
||||
fs.mkdirSync(homeSsh, { recursive: true });
|
||||
|
||||
console.log("Starting ssh-agent");
|
||||
|
||||
const authSock = core.getInput('ssh-auth-sock');
|
||||
const sshAgentArgs = (authSock && authSock.length > 0) ? ['-a', authSock] : [];
|
||||
|
||||
if (child_process.spawnSync(sshAdd, ['-l'], { env: { ...process.env, SSH_AUTH_SOCK: authSock || process.env.SSH_AUTH_SOCK } }).status === 0) {
|
||||
console.log('ssh-agent is already running, not starting a new one');
|
||||
} else {
|
||||
console.log("Starting ssh-agent");
|
||||
|
||||
// Extract auth socket path and agent pid and set them as job variables
|
||||
child_process.execFileSync(sshAgentCmd, sshAgentArgs).toString().split("\n").forEach(function(line) {
|
||||
child_process.execFileSync(sshAgent, sshAgentArgs).toString().split("\n").forEach(function(line) {
|
||||
const matches = /^(SSH_AUTH_SOCK|SSH_AGENT_PID)=(.*); export \1/.exec(line);
|
||||
|
||||
if (matches && matches.length > 0) {
|
||||
// This will also set process.env accordingly, so changes take effect for this script
|
||||
core.exportVariable(matches[1], matches[2])
|
||||
core.exportVariable(matches[1], matches[2]);
|
||||
console.log(`${matches[1]}=${matches[2]}`);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
console.log("Adding private key(s) to agent");
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue