diff --git a/action.yml b/action.yml index 7ca11f9..fb01ab3 100644 --- a/action.yml +++ b/action.yml @@ -23,5 +23,5 @@ inputs: runs: using: "composite" steps: - - run: ./binary.sh ${{ inputs.account_id }} ${{ inputs.access_key_id }} ${{ inputs.access_key_secret }} ${{ inputs.access }} + - run: ./script.sh ${{ inputs.account_id }} ${{ inputs.access_key_id }} ${{ inputs.access_key_secret }} ${{ inputs.access }} shell: bash \ No newline at end of file diff --git a/binary.sh b/binary.sh deleted file mode 100644 index 15e452a..0000000 --- a/binary.sh +++ /dev/null @@ -1,9 +0,0 @@ -set -e # 报错后不继续执行 -echo 'Serverless-devs installing.' -curl https://images.devsapp.cn/bin/s/v3.0.0 --output /usr/local/bin/s -chmod 777 /usr/local/bin/s -echo '################################################' -s config add --AccountID $1 --AccessKeyID $2 --AccessKeySecret $3 -a $4 -f -echo '################################################' -echo 'Serverless-devs has been installed successfully.' -echo 'The access has been configured automatically, use "s config get" to check.' \ No newline at end of file diff --git a/script.sh b/script.sh index c9c7c4b..15e452a 100644 --- a/script.sh +++ b/script.sh @@ -1,35 +1,9 @@ -# unused - set -e # 报错后不继续执行 -if ! which node > /dev/null; then - echo "Node is not installed, serverless-dev requires nodejs >= 14.14.0." - echo "You can install it manually or add actions/setup-node@v4 before actions/setup-s-aliyun in your .yaml/.yml file." -else - LOCAL_VERSION=$(node -v) - REQUIRED_VERSION='v14.14.0' - echo 'Checking nodejs version, serverless-dev requires nodejs >= 14.14.0.' - echo "Local nodejs's version is" $LOCAL_VERSION. - function version_compare() { - if [[ "$1" == "$2" ]]; then - echo 0 # 本地版本等于要求版本 - return - fi - if [[ "$(printf '%s\n' "$1" "$2" | sort -V | head -n1)" == "$1" ]]; then - echo 1 # 本地版本小于要求版本 - else - echo 0 # 本地版本大于要求版本 - fi - } - result=$(version_compare "$LOCAL_VERSION" "$REQUIRED_VERSION") - if [ "$result" == 0 ]; then - echo 'Nodejs checked, serverless-devs installing.' - npm i @serverless-devs/s -g --registry=https://registry.npmmirror.com - echo '################################################' - s config add --AccountID $1 --AccessKeyID $2 --AccessKeySecret $3 -a $4 -f - echo '################################################' - echo 'Serverless-devs has been installed successfully.' - echo 'The access has been configured automatically, use "s config get" to check.' - else - echo "Serverless-dev requires nodejs >= 14.14.0, please update your local nodejs's version." - fi -fi +echo 'Serverless-devs installing.' +curl https://images.devsapp.cn/bin/s/v3.0.0 --output /usr/local/bin/s +chmod 777 /usr/local/bin/s +echo '################################################' +s config add --AccountID $1 --AccessKeyID $2 --AccessKeySecret $3 -a $4 -f +echo '################################################' +echo 'Serverless-devs has been installed successfully.' +echo 'The access has been configured automatically, use "s config get" to check.' \ No newline at end of file