From c34149cbf57a15f7bef5664610237efe719bd047 Mon Sep 17 00:00:00 2001 From: Arthur Danjou Date: Wed, 16 Dec 2020 16:45:30 +0100 Subject: [PATCH 1/2] Update node.js.yml --- .github/workflows/node.js.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml index 1905310..af26aea 100644 --- a/.github/workflows/node.js.yml +++ b/.github/workflows/node.js.yml @@ -17,6 +17,7 @@ jobs: port: ${{ secrets.SSH_PORT }} username: ${{ secrets.SSH_USER }} key: ${{ secrets.SSH_KEY }} + passphrase: ${{ secrets.SSH_PASSPHRASE }} script: | cd ${{ secrets.PATH }} git pull origin master From 750b8b25e767cc8abe6880950d218054d1881e60 Mon Sep 17 00:00:00 2001 From: Arthur Danjou Date: Wed, 16 Dec 2020 18:14:31 +0100 Subject: [PATCH 2/2] Update node.js.yml --- .github/workflows/node.js.yml | 45 ++++++++++++----------------------- 1 file changed, 15 insertions(+), 30 deletions(-) diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml index af26aea..a09f980 100644 --- a/.github/workflows/node.js.yml +++ b/.github/workflows/node.js.yml @@ -20,36 +20,21 @@ jobs: passphrase: ${{ secrets.SSH_PASSPHRASE }} script: | cd ${{ secrets.PATH }} - git pull origin master + git pull origin master -r artapi artapi-new + cd artapi-new + git fetch --all + git reset --hard origin/master + yarn install --only=master + node ace build --production + cp .env build/.env + cd .. + mv artapi artapi-old + mv artapi-new artapi - build: - needs: [deploy] - runs-on: ubuntu-latest - steps: - - name: Build - uses: appleboy/ssh-action@v0.1.4 - with: - host: ${{ secrets.SSH_HOST }} - port: ${{ secrets.SSH_PORT }} - username: ${{ secrets.SSH_USER }} - key: ${{ secrets.SSH_KEY }} - script: | - cd ${{ secrets.PATH }} - yarn install - yarn build + # Restart server - run: - needs: [build] - runs-on: ubuntu-latest - steps: - - name: Build - uses: appleboy/ssh-action@v0.1.4 - with: - host: ${{ secrets.SSH_HOST }} - port: ${{ secrets.SSH_PORT }} - username: ${{ secrets.SSH_USER }} - key: ${{ secrets.SSH_KEY }} - script: | - cd ${{ secrets.PATH }} - pm2 restart artapi + cd artapi + pm2 kill + pm2 start build/server.js --name artapi + rm -rf ../artapi-old