diff --git a/.github/workflows/ssh-deploy.yml b/.github/workflows/ssh-deploy.yml index 8300549..3ab9425 100644 --- a/.github/workflows/ssh-deploy.yml +++ b/.github/workflows/ssh-deploy.yml @@ -17,4 +17,4 @@ jobs: - name: SSH and run deployment script run: | ssh -i ~/.ssh/id_ed25519 ${{ secrets.SSH_USER }}@${{ secrets.SSH_HOST }} \ - 'source ~/.bashrc && sh "${{ secrets.SOURCE_PATH }}"/deploy.sh "${{ secrets.SOURCE_PATH }}" "${{ secrets.STATIC_PATH }}" "${{ secrets.BACKEND_PATH }}"' + 'source ~/.nvm/nvm.sh && sh "${{ secrets.SOURCE_PATH }}"/deploy.sh "${{ secrets.SOURCE_PATH }}" "${{ secrets.STATIC_PATH }}" "${{ secrets.BACKEND_PATH }}"' diff --git a/.github/workflows/ssh-stage.yml b/.github/workflows/ssh-stage.yml index 4ed8cb8..7fe1988 100644 --- a/.github/workflows/ssh-stage.yml +++ b/.github/workflows/ssh-stage.yml @@ -20,4 +20,4 @@ jobs: - name: SSH and run staging script run: | ssh -i ~/.ssh/id_ed25519 ${{ secrets.SSH_USER }}@${{ secrets.SSH_HOST }} \ - 'source ~/.bashrc && sh "${{ secrets.SOURCE_PATH }}"/stage.sh "${{ secrets.SOURCE_PATH }}"' + 'source ~/.nvm/nvm.sh && sh "${{ secrets.SOURCE_PATH }}"/stage.sh "${{ secrets.SOURCE_PATH }}"' diff --git a/deploy.sh b/deploy.sh index c18d868..6581561 100755 --- a/deploy.sh +++ b/deploy.sh @@ -11,7 +11,6 @@ STATIC_DIR=$2 BACKEND_DIR=$3 pwd -npm i -g pnpm && pnpm setup pnpm i -g pm2 cd $SOURCE_DIR pnpm i @@ -23,4 +22,4 @@ cp -r $SOURCE_DIR/apps/vdn-static/dist/* "$STATIC_DIR" cp -r $SOURCE_DIR/apps/vdb-backend/dist/* "$BACKEND_DIR" cd $BACKEND_DIR -pm2 start . \ No newline at end of file +pm2 start . diff --git a/stage.sh b/stage.sh index 153b53a..692e1af 100755 --- a/stage.sh +++ b/stage.sh @@ -11,6 +11,6 @@ SOURCE_DIR=$1 cd "$SOURCE_DIR" git fetch --all && git branch "backup-$(date +'%s')" -npm i -g pnpm && pnpm setup && pnpm i -g turbo \ +pnpm i -g turbo \ && git checkout -f origin/main \ && pnpm i && turbo build