Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

v1.2.4 #186

Merged
merged 45 commits into from
May 19, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
d2fc31f
[FEAT] CI yml μž‘μ„±
Apr 10, 2024
1d66b71
[CHORE] Docker Compose 파일 Deprecated 처리
Apr 10, 2024
b8286e8
[FIX] ν…ŒμŠ€νŠΈ μ½”λ“œ 였λ₯˜ μˆ˜μ •
mikekks Apr 10, 2024
a2552d9
Merge branch 'develop' of https://github.com/sopt-makers/sopt-crew-ba…
Apr 10, 2024
e42bd95
Merge branch 'develop' of https://github.com/sopt-makers/sopt-crew-ba…
Apr 10, 2024
9771fea
[FIX] Build λͺ…λ Ήμ–΄ μˆ˜μ •
Apr 10, 2024
57e7fc0
[FIX] Build λͺ…λ Ήμ–΄ μˆ˜μ •
Apr 10, 2024
85dbfd0
[FEAT] secret κ°’ λ°›μ•„μ™€μ„œ 파일 λ§Œλ“œλŠ” 둜직 μΆ”κ°€
Apr 10, 2024
8b33123
[CHORE] ν˜„μž¬ 경둜 좜λ ₯ν•˜λŠ” μ½”λ“œ μΆ”κ°€
Apr 10, 2024
16fbf45
[CHORE] NestJS μ„œλ²„ CI κ³Όμ •μ—μ„œ μ œμ™Έ
Apr 10, 2024
5e79e03
[FEAT] μ—¬λŸ¬ 도컀 이미지λ₯Ό λ°°ν¬ν•˜κΈ° μœ„ν•œ 파일 μž‘μ„±
Apr 11, 2024
5ce84cd
[FEAT] CD 슀크립트 μž‘μ„±
Apr 13, 2024
b3226eb
[FIX] Docker Compose 파일 Deprecated μ‚­μ œ
Apr 21, 2024
b849d39
[CHORE] .gitignore에 deploy.sh μΆ”κ°€
Apr 21, 2024
6d0b94c
[FEAT] Docker Compose 파일 μˆ˜μ •
Apr 21, 2024
7f02a1b
[FEAT] cd.yml μˆ˜μ •
Apr 21, 2024
e5403dd
[CHORE] cd 이름 μˆ˜μ •
Apr 21, 2024
a01ae61
Merge branch 'develop' of https://github.com/sopt-makers/sopt-crew-ba…
Apr 21, 2024
41f3ea9
Merge branch 'develop' of https://github.com/sopt-makers/sopt-crew-ba…
Apr 21, 2024
c09e86d
[FEAT] dev, prod 별 cd.yml 뢄리
Apr 21, 2024
7144430
[CHORE] docker composeμ—μ„œ env 파일 경둜 μˆ˜μ •
Apr 21, 2024
fd845ee
[CHORE] swagger.env 파일 경둜 λ³€κ²½
Apr 21, 2024
226a27c
[CHORE] .swagger.env 파일 μ‚¬μš© μ•ˆν•˜λ„λ‘ 주석 처리
Apr 21, 2024
6912e0f
[CHORE] image νƒœκ·Έ μΆ”κ°€
Apr 21, 2024
c7849a9
[CHORE] docker compose 파일 μˆ˜μ •
Apr 21, 2024
8285124
[CHORE] 주석 제거
Apr 27, 2024
87968a1
[FIX] Spring 이미지에 secret κ°’ μ£Όμž…ν•˜λ„λ‘ μ„€μ •
Apr 28, 2024
dd48670
[FIX] application-secret.properties 파일 μƒμ„±ν•˜λ„λ‘ μˆ˜μ •
Apr 28, 2024
bceaf46
[FEAT] Health Check 방식 μˆ˜μ •
Apr 28, 2024
7be6628
[FEAT] Health Check 방식 μˆ˜μ •
Apr 28, 2024
44adb7a
[FEAT] Health Check 방식 μˆ˜μ •
Apr 28, 2024
5ea300e
[FEAT] λͺ¨μž„생성 API λ§ˆμ΄κ·Έλ ˆμ΄μ…˜ (#170)
mikekks Apr 30, 2024
f7bb9d0
[FIX] docker-compose.yml μˆ˜μ •
May 1, 2024
4d23c18
Merge branch 'develop' of https://github.com/sopt-makers/sopt-crew-ba…
May 1, 2024
e2632c7
Merge branch 'develop' into feat/#145
May 1, 2024
d41f1f4
[FIX] deploy.sh에 λ„μ»€ν—ˆλΈŒ λΉ„λ°€λ²ˆν˜Έ ν•˜λ“œμ½”λ”© μ‚­μ œ
May 1, 2024
63a54e4
[FEAT] Main, Dev 배포 방식 뢄리
May 1, 2024
5bc99d0
[CHORE] λΆˆν•„μš”ν•œ 주석 제거
May 1, 2024
ebdc677
[FEAT] PR ν…œν”Œλ¦Ώμ— PRμ „ 점검사항 μΆ”κ°€
May 1, 2024
3919b8b
Merge pull request #161 from sopt-makers/feat/#145
sgh002400 May 4, 2024
3e10ae2
[FIX] Route κ·œμΉ™ λ³€κ²½ (#176)
sgh002400 May 15, 2024
baf32eb
[CHORE] λ‘œκ·Έμ— sql 제거 (#178)
mikekks May 17, 2024
c6732a5
[FEAT] λͺ¨μž„ 지원 μ‹ μ²­/μ·¨μ†Œ API λ§ˆμ΄κ·Έλ ˆμ΄μ…˜ (#179)
yeseul106 May 17, 2024
d9379f8
[FEAT] λͺ¨μž„ 지원 μ·¨μ†Œ API μˆ˜μ • #181 (#182)
yeseul106 May 17, 2024
90cb693
[CHORE] λͺ¨μž„ 지원/μ·¨μ†Œ API μ—λŸ¬ 메세지 μˆ˜μ • (#184)
yeseul106 May 19, 2024
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
10 changes: 10 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,19 @@
## πŸ‘©β€πŸ’» Contents

<!-- μž‘μ—… λ‚΄μš©μ„ μ μ–΄μ£Όμ„Έμš” -->

## πŸ“ Review Note

<!-- PRκ³Όμ •μ—μ„œ λ“  μƒκ°μ΄λ‚˜ κ°œμ„ ν•  λ‚΄μš©μ΄ μžˆλ‹€λ©΄ μ μ–΄μ£Όμ„Έμš”. -->

## πŸ“£ Related Issue

<!-- κ΄€λ ¨ 이슈λ₯Ό μ μ–΄μ£Όμ„Έμš”. -->

- closed #

## βœ… 점검사항

- [ ] docker-compose.yml νŒŒμΌμ— λ§ˆμ΄κ·Έλ ˆμ΄μ…˜ ν•œ API의 ν¬μ›Œλ”©μ„ λ³€κ²½ν•΄μ€¬λ‚˜μš”?
- [ ] Spring Secret 값을 μˆ˜μ •ν•˜κ±°λ‚˜ μΆ”κ°€ν–ˆλ‹€λ©΄ Github Secretμ—μ„œ μˆ˜μ •μ„ ν•΄μ€¬λ‚˜μš”?
- [ ] Nestjs Secret 값을 μˆ˜μ •ν•˜κ±°λ‚˜ μΆ”κ°€ν–ˆλ‹€λ©΄ Docker-Compose.yml 파일 및 μΈμŠ€ν„΄μŠ€ λ‚΄λΆ€μ˜ .env νŒŒμΌμ„ μˆ˜μ •ν–ˆλ‚˜μš”?
55 changes: 55 additions & 0 deletions .github/workflows/cd-dev.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
name: Makers_Crew Dev CD
on:
workflow_run:
workflows: [ "Makers_Crew CI" ]
branches: [ "develop" ]
types: [ completed ]

push:
branches: [ "develop" ]
jobs:
deploy:
runs-on: ubuntu-22.04
env:
working-directory-spring: main
working-directory-nestjs: server
steps:
- name: Checkout
uses: actions/checkout@v3

- name: Docker build κ°€λŠ₯ν•˜λ„λ‘ ν™˜κ²½ μ„€μ •
uses: docker/setup-buildx-action@v2

- name: Create application.properties from secret
run: |
echo "${{ secrets.APPLICATION_SECRET_SPRING_DEV }}" > ./main/src/main/resources/application-secret.properties
shell: bash

- name: Docker hub에 둜그인
uses: docker/login-action@v1
with:
username: ${{ secrets.DOCKERHUB_LOGIN_USERNAME }}
password: ${{ secrets.DOCKERHUB_LOGIN_ACCESSTOKEN }}

- name: docker image λΉŒλ“œ 및 ν‘Έμ‹œ (Spring)
run: |
docker build --platform linux/amd64 -t makerscrew/main .
docker push makerscrew/main
working-directory: ${{ env.working-directory-spring }}

- name: docker image λΉŒλ“œ 및 ν‘Έμ‹œ (nestjs)
run: |
docker build --platform linux/amd64 -t makerscrew/server .
docker push makerscrew/server
working-directory: ${{ env.working-directory-nestjs }}

- name: 도컀 μ»¨ν…Œμ΄λ„ˆ μ‹€ν–‰
uses: appleboy/ssh-action@master
with:
host: ${{ secrets.DEV_SERVER_IP }}
username: ${{ secrets.DEV_SERVER_USER }}
key: ${{ secrets.DEV_SERVER_KEY }}
script: |
cd ~
chmod +x ./deploy.sh
./deploy.sh
55 changes: 55 additions & 0 deletions .github/workflows/cd-prod.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
name: Makers_Crew Main CD
on:
workflow_run:
workflows: [ "Makers_Crew CI" ]
branches: [ "main" ]
types: [ completed ]

push:
branches: [ "main" ]
jobs:
deploy:
runs-on: ubuntu-22.04
env:
working-directory-spring: main
working-directory-nestjs: server
steps:
- name: Checkout
uses: actions/checkout@v3

- name: Docker build κ°€λŠ₯ν•˜λ„λ‘ ν™˜κ²½ μ„€μ •
uses: docker/setup-buildx-action@v2

- name: Create application.properties from secret
run: |
echo "${{ secrets.APPLICATION_SECRET_SPRING_PROD }}" > ./main/src/main/resources/application-secret.properties
shell: bash

- name: Docker hub에 둜그인
uses: docker/login-action@v1
with:
username: ${{ secrets.DOCKERHUB_LOGIN_USERNAME }}
password: ${{ secrets.DOCKERHUB_LOGIN_ACCESSTOKEN }}

- name: docker image λΉŒλ“œ 및 ν‘Έμ‹œ (Spring)
run: |
docker build --platform linux/amd64 -t makerscrew/main .
docker push makerscrew/main
working-directory: ${{ env.working-directory-spring }}

- name: docker image λΉŒλ“œ 및 ν‘Έμ‹œ (nestjs)
run: |
docker build --platform linux/amd64 -t makerscrew/server .
docker push makerscrew/server
working-directory: ${{ env.working-directory-nestjs }}

- name: 도컀 μ»¨ν…Œμ΄λ„ˆ μ‹€ν–‰
uses: appleboy/ssh-action@master
with:
host: ${{ secrets.PROD_SERVER_IP }}
username: ${{ secrets.PROD_SERVER_USER }}
key: ${{ secrets.PROD_SERVER_KEY }}
script: |
cd ~
chmod +x ./deploy.sh
./deploy.sh
77 changes: 77 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,77 @@
name: Makers_Crew CI

on:
push:
branches:
- '**'

pull_request:
types: [ opened, synchronize, reopened ]
jobs:
build-springboot:
name: Build and analyze (SpringBoot)
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
with:
fetch-depth: 0

- name: Set up JDK 17
uses: actions/setup-java@v3
with:
java-version: 17
distribution: 'temurin'

- name: Cache Gradle packages
uses: actions/cache@v3
with:
path: |
~/.gradle/caches
~/.gradle/wrapper
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}

- name: Create application.properties from secret
run: |
echo "${{ secrets.APPLICATION_SECRET_SPRING_DEV }}" > ./main/src/main/resources/application-secret.properties
shell: bash

- name: Build and analyze (SpringBoot)
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
cd main
./gradlew clean build

# NsetJs μ„œλ²„μ˜ 경우 변경될 사항이 μ—†λ‹€κ³  μƒκ°ν•˜μ—¬ CI μž‘μ—… μƒλž΅ / λ§Œμ•½ CI μž‘μ—…μ΄ ν•„μš”ν•˜λ‹€λ©΄ 맨 λ°‘μ˜ 주석 μ°Έκ³ 
# build-nestjs:
# name: Build and analyze (NestJS)
# runs-on: ubuntu-latest
# steps:
# - uses: actions/checkout@v3
# with:
# fetch-depth: 0

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

# - name: Cache npm packages
# uses: actions/cache@v3
# with:
# path: server/node_modules
# key: ${{ runner.os }}-node-${{ hashFiles('server/package-lock.json') }}

# - name: Create .dev.env from secret
# run: |
# echo "${{ secrets.APPLICATION_SECRET_NESTJS_DEV }}" > ./server/.dev.env
# shell: bash

# - name: Build and analyze (NestJS)
# env:
# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
# run: |
# cd server
# npm ci
# npm run start
# Create .dev.env μž‘μ—…μ„ 톡해 .dev.env νŒŒμΌμ„ μƒμ„±ν–ˆμŒμ—λ„ CI μž‘μ—…μ΄ μ‹€νŒ¨ν•¨.
76 changes: 0 additions & 76 deletions .github/workflows/dev-CD.yml

This file was deleted.

2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
.vscode
/.idea/
/.idea/
Loading
Loading