mirror of
https://github.com/appleboy/ssh-action.git
synced 2025-04-21 13:42:02 +02:00
remove stderr, stdout works
This commit is contained in:
parent
4819506395
commit
bd67bfa881
5 changed files with 54 additions and 83 deletions
45
.github/workflows/main.yml
vendored
45
.github/workflows/main.yml
vendored
|
@ -523,3 +523,48 @@ jobs:
|
||||||
command_timeout: 30s
|
command_timeout: 30s
|
||||||
script: |
|
script: |
|
||||||
whoami
|
whoami
|
||||||
|
|
||||||
|
testing-capturing-output:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
steps:
|
||||||
|
- name: Checkout code
|
||||||
|
uses: actions/checkout@v4
|
||||||
|
|
||||||
|
- name: create new ssh server
|
||||||
|
run: |
|
||||||
|
docker run -d \
|
||||||
|
--name=openssh-server \
|
||||||
|
--hostname=openssh-server \
|
||||||
|
-p 2222:2222 \
|
||||||
|
-e SUDO_ACCESS=false \
|
||||||
|
-e PASSWORD_ACCESS=true \
|
||||||
|
-e USER_PASSWORD=password \
|
||||||
|
-e USER_NAME=linuxserver.io \
|
||||||
|
--restart unless-stopped \
|
||||||
|
lscr.io/linuxserver/openssh-server:latest
|
||||||
|
docker exec openssh-server sh -c "hostname -i" > ip.txt
|
||||||
|
echo "REMOTE_HOST<<EOF" >> $GITHUB_ENV
|
||||||
|
cat ip.txt >> $GITHUB_ENV
|
||||||
|
echo "EOF" >> $GITHUB_ENV
|
||||||
|
echo "======= container ip address ========="
|
||||||
|
cat ip.txt
|
||||||
|
echo "======================================"
|
||||||
|
sleep 2
|
||||||
|
|
||||||
|
- id: stdout
|
||||||
|
name: ssh command with stdout
|
||||||
|
uses: ./
|
||||||
|
with:
|
||||||
|
host: ${{ env.REMOTE_HOST }}
|
||||||
|
username: linuxserver.io
|
||||||
|
password: password
|
||||||
|
port: 2222
|
||||||
|
capture_stdout: 'true'
|
||||||
|
script: |
|
||||||
|
#!/usr/bin/env bash
|
||||||
|
set -e
|
||||||
|
whoami
|
||||||
|
|
||||||
|
- name: check stdout
|
||||||
|
run: |
|
||||||
|
echo "stdout: ${{ steps.stdout.outputs.stdout }}"
|
||||||
|
|
62
.github/workflows/stable.yml
vendored
62
.github/workflows/stable.yml
vendored
|
@ -484,65 +484,3 @@ jobs:
|
||||||
script: |
|
script: |
|
||||||
whoami && echo 'hello world' && touch todo.txt
|
whoami && echo 'hello world' && touch todo.txt
|
||||||
sudo whoami
|
sudo whoami
|
||||||
|
|
||||||
testing-with-stdouterr:
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
steps:
|
|
||||||
- name: Checkout code
|
|
||||||
uses: actions/checkout@v4
|
|
||||||
|
|
||||||
- name: create new ssh server
|
|
||||||
run: |
|
|
||||||
docker run -d \
|
|
||||||
--name=openssh-server \
|
|
||||||
--hostname=openssh-server \
|
|
||||||
-p 2222:2222 \
|
|
||||||
-e SUDO_ACCESS=false \
|
|
||||||
-e PASSWORD_ACCESS=true \
|
|
||||||
-e USER_PASSWORD=password \
|
|
||||||
-e USER_NAME=linuxserver.io \
|
|
||||||
--restart unless-stopped \
|
|
||||||
lscr.io/linuxserver/openssh-server:latest
|
|
||||||
docker exec openssh-server sh -c "hostname -i" > ip.txt
|
|
||||||
echo "REMOTE_HOST<<EOF" >> $GITHUB_ENV
|
|
||||||
cat ip.txt >> $GITHUB_ENV
|
|
||||||
echo "EOF" >> $GITHUB_ENV
|
|
||||||
echo "======= container ip address ========="
|
|
||||||
cat ip.txt
|
|
||||||
echo "======================================"
|
|
||||||
sleep 2
|
|
||||||
|
|
||||||
- name: ssh command with stdout
|
|
||||||
uses: appleboy/ssh-action@v1.2.0
|
|
||||||
with:
|
|
||||||
host: ${{ env.REMOTE_HOST }}
|
|
||||||
username: linuxserver.io
|
|
||||||
password: password
|
|
||||||
port: 2222
|
|
||||||
capture_stdout: 'true'
|
|
||||||
script: |
|
|
||||||
#!/usr/bin/env bash
|
|
||||||
set -e
|
|
||||||
whoami
|
|
||||||
|
|
||||||
- name: check stdout
|
|
||||||
run: |
|
|
||||||
echo "stdout: ${{ steps.ssh-command-with-stdout.outputs.stdout }}"
|
|
||||||
|
|
||||||
- name: ssh command with stderr
|
|
||||||
uses: appleboy/ssh-action@v1.2.0
|
|
||||||
continue-on-error: true
|
|
||||||
with:
|
|
||||||
host: ${{ env.REMOTE_HOST }}
|
|
||||||
username: linuxserver.io
|
|
||||||
password: password
|
|
||||||
port: 2222
|
|
||||||
capture_stderr: 'true'
|
|
||||||
script: |
|
|
||||||
#!/usr/bin/env bash
|
|
||||||
set -e
|
|
||||||
ls /root
|
|
||||||
|
|
||||||
- name: check stderr
|
|
||||||
run: |
|
|
||||||
echo "stderr: ${{ steps.ssh-command-with-stderr.outputs.stderr }}"
|
|
||||||
|
|
|
@ -80,15 +80,10 @@ inputs:
|
||||||
capture_stdout:
|
capture_stdout:
|
||||||
description: "Capture the stdout of the commands."
|
description: "Capture the stdout of the commands."
|
||||||
default: "false"
|
default: "false"
|
||||||
capture_stderr:
|
|
||||||
description: "Capture the stderr of the commands."
|
|
||||||
default: "false"
|
|
||||||
|
|
||||||
outputs:
|
outputs:
|
||||||
stdout:
|
stdout:
|
||||||
description: 'Standard output of the executed commands.'
|
description: 'Standard output of the executed commands.'
|
||||||
stderr:
|
|
||||||
description: 'Standard error of the executed commands.'
|
|
||||||
|
|
||||||
runs:
|
runs:
|
||||||
using: "composite"
|
using: "composite"
|
||||||
|
@ -137,7 +132,6 @@ runs:
|
||||||
INPUT_PROXY_CIPHER: ${{ inputs.proxy_cipher }}
|
INPUT_PROXY_CIPHER: ${{ inputs.proxy_cipher }}
|
||||||
INPUT_SYNC: ${{ inputs.sync }}
|
INPUT_SYNC: ${{ inputs.sync }}
|
||||||
INPUT_CAPTURE_STDOUT: ${{ inputs.capture_stdout }}
|
INPUT_CAPTURE_STDOUT: ${{ inputs.capture_stdout }}
|
||||||
INPUT_CAPTURE_STDERR: ${{ inputs.capture_stderr }}
|
|
||||||
|
|
||||||
branding:
|
branding:
|
||||||
icon: "terminal"
|
icon: "terminal"
|
||||||
|
|
|
@ -68,27 +68,20 @@ chmod +x ${TARGET}
|
||||||
echo "======= CLI Version ======="
|
echo "======= CLI Version ======="
|
||||||
sh -c "${TARGET} --version" # print version
|
sh -c "${TARGET} --version" # print version
|
||||||
echo "==========================="
|
echo "==========================="
|
||||||
if [ "$INPUT_CAPTURE_STDOUT" == 'true' ] || [ "$INPUT_CAPTURE_STDERR" == 'true' ]; then
|
if [[ "$INPUT_CAPTURE_STDOUT" == 'true' ]]; then
|
||||||
_stdout=/dev/stdout
|
_stdout=/dev/stdout
|
||||||
_stderr=/dev/stderr
|
if [[ "$INPUT_CAPTURE_STDOUT" == 'true' ]]; then
|
||||||
if [ "$INPUT_CAPTURE_STDOUT" == 'true' ]; then
|
_stdout=/tmp/_stdout
|
||||||
_stdout=/tmp/outFile
|
|
||||||
fi
|
|
||||||
if [ "$INPUT_CAPTURE_STDERR" == 'true' ]; then
|
|
||||||
_stderr=/tmp/errFile
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
{
|
{
|
||||||
sh -c "${TARGET} $*" # run the command
|
sh -c "${TARGET} $*" # run the command
|
||||||
} 2> $_stderr | tee $_stdout
|
} | tee $_stdout
|
||||||
|
|
||||||
if [ "$INPUT_CAPTURE_STDOUT" == 'true' ]; then
|
if [[ "$INPUT_CAPTURE_STDOUT" == 'true' ]]; then
|
||||||
stdout=$(cat $_stdout)
|
echo 'stdout<<EOF' >> $GITHUB_OUTPUT
|
||||||
echo "stdout=${stdout//$'\n'/\\n}" >> $GITHUB_OUTPUT
|
cat $_stdout >> $GITHUB_OUTPUT
|
||||||
fi
|
echo 'EOF' >> $GITHUB_OUTPUT
|
||||||
if [ "$INPUT_CAPTURE_STDERR" == 'true' ]; then
|
|
||||||
stderr=$(cat $_stderr)
|
|
||||||
echo "stderr=${stderr//$'\n'/\\n}" >> $GITHUB_OUTPUT
|
|
||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
sh -c "${TARGET} $*" # run the command
|
sh -c "${TARGET} $*" # run the command
|
||||||
|
|
1
testdata/test.sh
vendored
1
testdata/test.sh
vendored
|
@ -1,3 +1,4 @@
|
||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
set -e
|
set -e
|
||||||
|
echo "Hello, World!"
|
||||||
whoami
|
whoami
|
||||||
|
|
Loading…
Add table
Reference in a new issue