diff --git a/.github/workflows/deploy-preview.yml b/.github/workflows/deploy-preview.yml index f790f2d..8ff1750 100644 --- a/.github/workflows/deploy-preview.yml +++ b/.github/workflows/deploy-preview.yml @@ -10,22 +10,13 @@ jobs: environment: preview steps: - uses: actions/checkout@v3 - - uses: actions/setup-node@v2 + - uses: oven-sh/setup-bun@v1 + - uses: kielabokkie/ssh-key-and-known-hosts-action@v1 with: - node-version: "16" - - name: Setup Host SSH - run: | - mkdir -p ~/.ssh - echo "$SSH_PRIVATE_KEY" > ~/.ssh/id_ed25519 - chmod 600 ~/.ssh/id_ed25519 - echo "$SSH_KNOWN_HOSTS" > ~/.ssh/known_hosts - chmod 600 ~/.ssh/known_hosts - shell: bash - env: - SSH_PRIVATE_KEY: ${{ secrets.SSH_PRIVATE_KEY }} - SSH_KNOWN_HOSTS: ${{ secrets.SSH_KNOWN_HOSTS }} + ssh-private-key: ${{ secrets.SSH_PRIVATE_KEY }} + ssh-host: ${{ secrets.DEPLOY_HOST }} - name: Install pm2 - run: npm install pm2 --location=global + run: bun install pm2 -g shell: bash - name: Deploy using pm2 run: pm2 deploy ecosystem.config.js preview @@ -33,7 +24,6 @@ jobs: # Deploy environment variables DEPLOY_HOST: ${{ secrets.DEPLOY_HOST }} SSH_USERNAME: ${{ secrets.SSH_USERNAME }} - SSH_HOST: ${{ secrets.SSH_HOST }} DEPLOY_PATH: ${{ secrets.DEPLOY_PATH }} # App environment variables APP_NAME: ${{ secrets.APP_NAME }} diff --git a/.github/workflows/deploy-production.yml b/.github/workflows/deploy-production.yml index 79acd27..2c8b6c6 100644 --- a/.github/workflows/deploy-production.yml +++ b/.github/workflows/deploy-production.yml @@ -10,22 +10,13 @@ jobs: environment: production steps: - uses: actions/checkout@v3 - - uses: actions/setup-node@v2 + - uses: oven-sh/setup-bun@v1 + - uses: kielabokkie/ssh-key-and-known-hosts-action@v1 with: - node-version: "16" - - name: Setup Host SSH - run: | - mkdir -p ~/.ssh - echo "$SSH_PRIVATE_KEY" > ~/.ssh/id_ed25519 - chmod 600 ~/.ssh/id_ed25519 - echo "$SSH_KNOWN_HOSTS" > ~/.ssh/known_hosts - chmod 600 ~/.ssh/known_hosts - shell: bash - env: - SSH_PRIVATE_KEY: ${{ secrets.SSH_PRIVATE_KEY }} - SSH_KNOWN_HOSTS: ${{ secrets.SSH_KNOWN_HOSTS }} + ssh-private-key: ${{ secrets.SSH_PRIVATE_KEY }} + ssh-host: ${{ secrets.DEPLOY_HOST }} - name: Install pm2 - run: npm install pm2 --location=global + run: bun install pm2 -g shell: bash - name: Deploy using pm2 run: pm2 deploy ecosystem.config.js production @@ -33,7 +24,6 @@ jobs: # Deploy environment variables DEPLOY_HOST: ${{ secrets.DEPLOY_HOST }} SSH_USERNAME: ${{ secrets.SSH_USERNAME }} - SSH_HOST: ${{ secrets.SSH_HOST }} DEPLOY_PATH: ${{ secrets.DEPLOY_PATH }} # App environment variables APP_NAME: ${{ secrets.APP_NAME }} diff --git a/.github/workflows/setup-preview.yml b/.github/workflows/setup-preview.yml index 9d28d61..fcda9f8 100644 --- a/.github/workflows/setup-preview.yml +++ b/.github/workflows/setup-preview.yml @@ -8,22 +8,13 @@ jobs: environment: preview steps: - uses: actions/checkout@v3 - - uses: actions/setup-node@v2 + - uses: oven-sh/setup-bun@v1 + - uses: kielabokkie/ssh-key-and-known-hosts-action@v1 with: - node-version: "16" - - name: Setup Host SSH - run: | - mkdir -p ~/.ssh - echo "$SSH_PRIVATE_KEY" > ~/.ssh/id_ed25519 - chmod 600 ~/.ssh/id_ed25519 - echo "$SSH_KNOWN_HOSTS" > ~/.ssh/known_hosts - chmod 600 ~/.ssh/known_hosts - shell: bash - env: - SSH_PRIVATE_KEY: ${{ secrets.SSH_PRIVATE_KEY }} - SSH_KNOWN_HOSTS: ${{ secrets.SSH_KNOWN_HOSTS }} + ssh-private-key: ${{ secrets.SSH_PRIVATE_KEY }} + ssh-host: ${{ secrets.DEPLOY_HOST }} - name: Install pm2 - run: npm install pm2 --location=global + run: bun install pm2 -g shell: bash - name: Deploy using pm2 run: pm2 deploy ecosystem.config.js preview setup @@ -31,7 +22,6 @@ jobs: # Deploy environment variables DEPLOY_HOST: ${{ secrets.DEPLOY_HOST }} SSH_USERNAME: ${{ secrets.SSH_USERNAME }} - SSH_HOST: ${{ secrets.SSH_HOST }} DEPLOY_PATH: ${{ secrets.DEPLOY_PATH }} # App environment variables APP_NAME: ${{ secrets.APP_NAME }} diff --git a/.github/workflows/setup-production.yml b/.github/workflows/setup-production.yml index 71012b8..125176b 100644 --- a/.github/workflows/setup-production.yml +++ b/.github/workflows/setup-production.yml @@ -8,22 +8,13 @@ jobs: environment: production steps: - uses: actions/checkout@v3 - - uses: actions/setup-node@v2 + - uses: oven-sh/setup-bun@v1 + - uses: kielabokkie/ssh-key-and-known-hosts-action@v1 with: - node-version: "16" - - name: Setup Host SSH - run: | - mkdir -p ~/.ssh - echo "$SSH_PRIVATE_KEY" > ~/.ssh/id_ed25519 - chmod 600 ~/.ssh/id_ed25519 - echo "$SSH_KNOWN_HOSTS" > ~/.ssh/known_hosts - chmod 600 ~/.ssh/known_hosts - shell: bash - env: - SSH_PRIVATE_KEY: ${{ secrets.SSH_PRIVATE_KEY }} - SSH_KNOWN_HOSTS: ${{ secrets.SSH_KNOWN_HOSTS }} + ssh-private-key: ${{ secrets.SSH_PRIVATE_KEY }} + ssh-host: ${{ secrets.DEPLOY_HOST }} - name: Install pm2 - run: npm install pm2 --location=global + run: bun install pm2 -g shell: bash - name: Deploy using pm2 run: pm2 deploy ecosystem.config.js production setup @@ -31,7 +22,6 @@ jobs: # Deploy environment variables DEPLOY_HOST: ${{ secrets.DEPLOY_HOST }} SSH_USERNAME: ${{ secrets.SSH_USERNAME }} - SSH_HOST: ${{ secrets.SSH_HOST }} DEPLOY_PATH: ${{ secrets.DEPLOY_PATH }} # App environment variables APP_NAME: ${{ secrets.APP_NAME }} diff --git a/ecosystem.config.js b/ecosystem.config.js index eebf2ea..b30abe8 100644 --- a/ecosystem.config.js +++ b/ecosystem.config.js @@ -2,7 +2,7 @@ module.exports = { apps: [ { name: process.env.APP_NAME || 'entgamers-website', - script: 'npm', + script: 'bun', args: 'start', env: { NODE_ENV: 'production', @@ -19,7 +19,6 @@ module.exports = { ref: 'origin/production', repo: 'https://github.com/SrJuggernaut/entgamers_pro', path: process.env.DEPLOY_PATH, - 'pre-deploy': 'yarn install && yarn run build', 'post-deploy': 'pm2 startOrRestart ecosystem.config.js', env: { APP_NAME: process.env.APP_NAME, @@ -34,7 +33,6 @@ module.exports = { ref: 'origin/preview', repo: 'https://github.com/SrJuggernaut/entgamers_pro', path: process.env.DEPLOY_PATH, - 'pre-deploy': 'yarn install && yarn run build', 'post-deploy': 'pm2 startOrRestart ecosystem.config.js', env: { APP_NAME: process.env.APP_NAME, diff --git a/package.json b/package.json index 30617ef..cc141fe 100644 --- a/package.json +++ b/package.json @@ -5,6 +5,7 @@ "scripts": { "develop": "next dev", "build": "next build", + "prestart": "bun install && next build", "start": "next start", "lint": "next lint", "prepare": "husky install" @@ -49,4 +50,4 @@ "husky": "^8.0.3", "typescript": "5.2.2" } -} +} \ No newline at end of file