Skip to content

Commit

Permalink
Merge pull request #614 from hngprojects/Lanky-23-patch-2
Browse files Browse the repository at this point in the history
Update dev.yml
  • Loading branch information
Rob-in-son authored Aug 21, 2024
2 parents 3e46fb3 + 25b2efc commit 8bfac95
Show file tree
Hide file tree
Showing 7 changed files with 134 additions and 110 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:

jobs:
deploy:
runs-on: bp-runner
runs-on: bp_runner
defaults:
run:
working-directory: /var/www/aihomework/boilerplate/dev
Expand Down
122 changes: 63 additions & 59 deletions .github/workflows/prod.yml
Original file line number Diff line number Diff line change
@@ -1,74 +1,78 @@
name: Deploy to Prod
name: Deploy to production

on:
workflow_run:
workflows: [CI]
types:
- completed
branches: [prod]
push:
branches:
- prod

jobs:
on-success:
runs-on: ubuntu-latest
if: ${{ github.event.workflow_run.conclusion == 'success' }}
deploy:
runs-on: bp_runner
defaults:
run:
working-directory: /var/www/aihomework/boilerplate/prod

steps:
- name: Checkout repository
uses: actions/checkout@v4

- name: Install sshpass
run: sudo apt-get install sshpass
- name: Checkout code
uses: actions/checkout@v3
with:
fetch-depth: 0

- name: Fetch .env file from server
run: |
sshpass -p ${{ secrets.PASSWORD }} scp -o StrictHostKeyChecking=no ${{ secrets.USERNAME }}@${{ secrets.HOST }}:~/prod-deployment/hng_boilerplate_expressjs/.env .env
env:
SSH_HOST: ${{ secrets.HOST }}
SSH_USERNAME: ${{ secrets.USERNAME }}
SSH_PASSWORD: ${{ secrets.PASSWORD }}
- name: Setup Node.js
uses: actions/setup-node@v3
with:
node-version: '20'

- name: Build Docker images
- name: Remove old actions remote URL
continue-on-error: true
run: |
docker compose --env-file .env -f docker-compose.production.yml build
git remote rm action
- name: List Docker images
run: docker images
- name: Stash or remove local changes
run: |
if git diff --quiet; then
echo "No local changes to stash."
else
echo "Stashing local changes..."
git stash --include-untracked || echo "Failed to stash changes. Attempting to reset..."
git reset --hard || exit 1
fi
- name: Save Docker images to tarball
- name: Pull from GitHub
id: pull
run: |
docker save hng_boilerplate_expressjs-backend_prod:latest | gzip > prod-images.tar.gz
remote_repo="https://${GITHUB_ACTOR}:${{ secrets.GITHUB_TOKEN }}@github.com/${GITHUB_REPOSITORY}.git"
git remote add action $remote_repo
git pull $remote_repo prod
- name: Upload artifact
uses: actions/upload-artifact@v2
with:
name: prod-images
path: prod-images.tar.gz
- name: Install dependencies
run: yarn install --frozen-lockfile

- name: Copy Docker images to server
uses: appleboy/scp-action@master
with:
host: ${{ secrets.HOST }}
username: ${{ secrets.USERNAME }}
password: ${{ secrets.PASSWORD }}
source: "prod-images.tar.gz"
target: "~/images-tar"
- name: Run tests
run: yarn test

- name: Deploy to server
uses: appleboy/ssh-action@master
with:
host: ${{ secrets.HOST }}
username: ${{ secrets.USERNAME }}
password: ${{ secrets.PASSWORD }}
script: |
cd ~/prod-deployment/hng_boilerplate_expressjs
git stash
git checkout prod
git pull
docker load -i ~/images-tar/prod-images.tar.gz
docker compose -f docker-compose.production.yml down
docker compose -f docker-compose.production.yml up -d
- name: Build the application
run: yarn build && sudo rm -rf build

on-failure:
runs-on: ubuntu-latest
if: ${{ github.event.workflow_run.conclusion == 'failure' }}
steps:
- run: echo "CI Workflow failed. Prod deployment was not triggered."
# - name: Generate migrations
# run: yarn migration:generate

# - name: Run migrations
# run: yarn migration:run

- name: Setup and restart service
run: |
sudo cp server-script/aihomeworkprod.service /etc/systemd/system
sudo systemctl daemon-reload
sudo systemctl restart aihomeworkprod.service
- name: Verify deployment
run: |
echo "Waiting for service to start..."
sleep 10
if sudo systemctl is-active --quiet aihomeworkprod.service; then
echo "Deployment successful!"
else
echo "Deployment failed!"
exit 1
fi
106 changes: 63 additions & 43 deletions .github/workflows/staging.yml
Original file line number Diff line number Diff line change
@@ -1,58 +1,78 @@
name: Deploy to staging

on:
workflow_run:
workflows: [CI]
types:
- completed
branches: [staging]
push:
branches:
- staging

jobs:
deploy:
runs-on: ubuntu-latest
runs-on: bp_runner
defaults:
run:
working-directory: /var/www/aihomework/boilerplate/staging

steps:
- name: Checkout repository
uses: actions/checkout@v4
- name: Checkout code
uses: actions/checkout@v3
with:
fetch-depth: 0

- name: Setup Node.js
uses: actions/setup-node@v3
with:
node-version: '20'

- name: Fetch .env file from server
- name: Remove old actions remote URL
continue-on-error: true
run: |
sshpass -p ${{ secrets.PASSWORD }} scp -o StrictHostKeyChecking=no ${{ secrets.USERNAME }}@${{ secrets.HOST }}:~/staging-deployment/hng_boilerplate_expressjs/.env .env
env:
SSH_HOST: ${{ secrets.HOST }}
SSH_USERNAME: ${{ secrets.USERNAME }}
SSH_PASSWORD: ${{ secrets.PASSWORD }}
git remote rm action
- name: Build Docker images
- name: Stash or remove local changes
run: |
docker compose --env-file .env -f docker-compose.staging.yml build
if git diff --quiet; then
echo "No local changes to stash."
else
echo "Stashing local changes..."
git stash --include-untracked || echo "Failed to stash changes. Attempting to reset..."
git reset --hard || exit 1
fi
- name: Pull from GitHub
id: pull
run: |
remote_repo="https://${GITHUB_ACTOR}:${{ secrets.GITHUB_TOKEN }}@github.com/${GITHUB_REPOSITORY}.git"
git remote add action $remote_repo
git pull $remote_repo staging
- name: Install dependencies
run: yarn install --frozen-lockfile

- name: List Docker images
run: docker images
- name: Run tests
run: yarn test

- name: Save Docker images to tarball
- name: Build the application
run: yarn build && sudo rm -rf build

# - name: Generate migrations
# run: yarn migration:generate

# - name: Run migrations
# run: yarn migration:run

- name: Setup and restart service
run: |
docker save hng_boilerplate_expressjs-backend_staging:latest | gzip > staging-images.tar.gz
sudo cp server-script/aihomeworkstaging.service /etc/systemd/system
sudo systemctl daemon-reload
sudo systemctl restart aihomeworkstaging.service
- name: Copy Docker images to server
uses: appleboy/scp-action@master
with:
host: ${{ secrets.HOST }}
username: ${{ secrets.USERNAME }}
password: ${{ secrets.PASSWORD }}
source: "staging-images.tar.gz"
target: "~/images-tar"

- name: Deploy to server
uses: appleboy/ssh-action@master
with:
host: ${{ secrets.HOST }}
username: ${{ secrets.USERNAME }}
password: ${{ secrets.PASSWORD }}
script: |
cd ~/staging-deployment/hng_boilerplate_expressjs
git stash
git checkout staging
git pull
docker load -i ~/images-tar/staging-images.tar.gz
docker compose -f docker-compose.staging.yml down
docker compose -f docker-compose.staging.yml up -d
- name: Verify deployment
run: |
echo "Waiting for service to start..."
sleep 10
if sudo systemctl is-active --quiet aihomeworkstaging.service; then
echo "Deployment successful!"
else
echo "Deployment failed!"
exit 1
fi
6 changes: 3 additions & 3 deletions server-script/aihomeworkprod.service
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ Description=AIHomework-Prod
After=network.target

[Service]
WorkingDirectory=/var/www/aihomework/prod
ExecStart=/bin/bash /var/www/aihomework/prod/server-script/startappprod.sh
WorkingDirectory=/var/www/aihomework/boilerplate/prod
ExecStart=/bin/bash /var/www/aihomework/boilerplate/prod/server-script/startappprod.sh
#Restart=on-failure
#RestartSec=20s
StartLimitInterval=0

[Install]
WantedBy=multi-user.target
WantedBy=multi-user.target
4 changes: 2 additions & 2 deletions server-script/aihomeworkstaging.service
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ Description=AIHomework-Dev
After=network.target

[Service]
WorkingDirectory=/var/www/aihomework/staging
ExecStart=/bin/bash /var/www/aihomework/dev/server-script/startappstaging.sh
WorkingDirectory=/var/www/aihomework/boilerplate/staging
ExecStart=/bin/bash /var/www/aihomework/dev/boilerplate/server-script/startappstaging.sh
#Restart=on-failure
#RestartSec=20s
StartLimitInterval=0
Expand Down
2 changes: 1 addition & 1 deletion server-script/startappprod.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/bash

cd /var/www/aihomework/prod/
cd /var/www/aihomework/boilerplate/prod/
mkdir -p logs
/usr/bin/yarn start >> logs/prodoutput.log 2>&1
2 changes: 1 addition & 1 deletion server-script/startappstaging.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/bash

cd /var/www/aihomework/staging/
cd /var/www/aihomework/boilerplate/staging
mkdir -p logs
/usr/bin/yarn start >> logs/stagingoutput.log 2>&1

0 comments on commit 8bfac95

Please sign in to comment.