Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
88 changes: 49 additions & 39 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,43 +5,9 @@ on:
branches: [deploy]

jobs:
frontend:
name: Deploy Frontend to S3
runs-on: ubuntu-22.04

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

- name: Set up Node.js
uses: actions/setup-node@v3
with:
node-version: '22'

- name: Install dependencies
run: |
cd frontend
npm ci

- name: Build frontend
run: |
cd frontend
npm run build

- name: Deploy to S3
uses: jakejarvis/s3-sync-action@master
with:
args: --delete
env:
AWS_S3_BUCKET: www.pirocheck.org
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
SOURCE_DIR: frontend/dist

backend:
name: Deploy Backend to EC2
needs: frontend
runs-on: ubuntu-latest
runs-on: ubuntu-22.04

steps:
- name: Checkout repository
Expand All @@ -53,10 +19,18 @@ jobs:
distribution: 'temurin'
java-version: '17'

- name: Build backend
- name: Create .env file& Build backend
run: |
cd backend
./gradlew build --no-daemon
cd backend/pirocheck
echo DB_HOST=${{ secrets.DB_HOST }} >> .env
echo DB_PORT=${{ secrets.DB_PORT }} >> .env
echo DB_NAME=${{ secrets.DB_NAME }} >> .env
echo DB_USER=${{ secrets.DB_USER }} >> .env
echo DB_PASSWORD=${{ secrets.DB_PASSWORD }} >> .env

chmod +x gradlew
./gradlew build -x test --no-daemon


- name: Restore PEM file
run: |
Expand All @@ -65,7 +39,7 @@ jobs:

- name: Copy JAR to EC2
run: |
scp -o StrictHostKeyChecking=no -i pirocheck.pem backend/build/libs/*.jar ubuntu@${{ secrets.EC2_HOST }}:/home/ubuntu/app.jar
scp -o StrictHostKeyChecking=no -i pirocheck.pem backend/pirocheck/build/libs/*.jar ubuntu@${{ secrets.EC2_HOST }}:/home/ubuntu/

- name: Restart Spring Boot on EC2
run: |
Expand Down Expand Up @@ -97,3 +71,39 @@ jobs:
"color": 16711680
}]
}' ${{ secrets.DISCORD_WEBHOOK }}

frontend:
name: Deploy Frontend to S3
needs: backend
runs-on: ubuntu-22.04

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

- name: Set up Node.js
uses: actions/setup-node@v3
with:
node-version: '22'

- name: Install dependencies
run: |
cd frontend
rm -rf node_modules package-lock.json
npm install
npm install --save-dev vite rollup

- name: Build frontend
run: |
cd frontend
npm run build

- name: Deploy to S3
uses: jakejarvis/s3-sync-action@master
with:
args: --delete
env:
AWS_S3_BUCKET: www.pirocheck.org
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
SOURCE_DIR: frontend/dist
2 changes: 1 addition & 1 deletion backend/pirocheck/gradlew

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion frontend/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion frontend/src/utils/AssignmentStatus.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const mapStatus = (status) => {
export const mapStatus = (status) => {
switch (status) {
case "SUCCESS":
return "done";
Expand Down
Loading