Skip to content

Commit 3801763

Browse files
authored
Merge pull request #62 from prgrms-web-devcourse/develop
main 브랜치 push
2 parents b962cdc + 2e45b38 commit 3801763

File tree

107 files changed

+5350
-265
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

107 files changed

+5350
-265
lines changed

β€Ž.github/ISSUE_TEMPLATE.mdβ€Ž

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
## ✨ Description
2+
3+
> κΈ°λŠ₯에 λŒ€ν•œ μ„€λͺ…을 μ μŠ΅λ‹ˆλ‹€.
4+
5+
## πŸ“Œ κ΅¬ν˜„ λ‚΄μš©
6+
7+
- [ ] κ΅¬ν˜„ν•œ κΈ°λŠ₯을 μ μŠ΅λ‹ˆλ‹€ (1)
8+
- [ ] κ΅¬ν˜„ν•œ κΈ°λŠ₯을 μ μŠ΅λ‹ˆλ‹€ (2)
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
## πŸ“„ Description
2+
3+
- close : #
4+
5+
> κΈ°λŠ₯에 λŒ€ν•œ μ„€λͺ…
6+
7+
## πŸ“Œ κ΅¬ν˜„ λ‚΄μš©
8+
9+
- [ ] κ΅¬ν˜„ν•œ κΈ°λŠ₯을 μ μŠ΅λ‹ˆλ‹€ (1)
10+
- [ ] κ΅¬ν˜„ν•œ κΈ°λŠ₯을 μ μŠ΅λ‹ˆλ‹€ (2)
11+
12+
## βœ… PR 포인트
13+
14+
μ—†μœΌλ©΄ μƒλž΅ κ°€λŠ₯

β€Ž.github/workflows/deploy.ymlβ€Ž

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
name: Ahpuh CI Deploy
2+
3+
on:
4+
workflow_dispatch:
5+
6+
env:
7+
S3_BUCKET_NAME: team8-ahpuh
8+
PROJECT_NAME: surf
9+
DB_URL: ${{ secrets.DB_URL }}
10+
USERNAME: ${{ secrets.DB_USERNAME }}
11+
DB_PWD: ${{ secrets.DB_PW }}
12+
13+
jobs:
14+
build:
15+
runs-on: ubuntu-latest
16+
17+
steps:
18+
- name: Checkout
19+
uses: actions/checkout@v2
20+
21+
- name: Set up JDK 17
22+
uses: actions/setup-java@v1
23+
with:
24+
java-version: '17'
25+
26+
- name: Grant execute permission for gradlew
27+
run: chmod +x ./gradlew
28+
shell: bash
29+
30+
- name: Build with Gradle
31+
run: ./gradlew clean build
32+
shell: bash
33+
34+
- name: Make zip file
35+
run: zip -r ./$GITHUB_SHA.zip .
36+
shell: bash
37+
38+
- name: Configure AWS credentials
39+
uses: aws-actions/configure-aws-credentials@v1
40+
with:
41+
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
42+
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
43+
aws-region: ${{ secrets.AWS_REGION }}
44+
45+
- name: Upload to S3
46+
run: aws s3 cp --region ap-northeast-2 ./$GITHUB_SHA.zip s3://$S3_BUCKET_NAME/$PROJECT_NAME/$GITHUB_SHA.zip
47+
48+
- name: Code Deploy
49+
run: aws deploy create-deployment --application-name surf-app --deployment-config-name CodeDeployDefault.AllAtOnce --deployment-group-name develop --s3-location bucket=$S3_BUCKET_NAME,bundleType=zip,key=$PROJECT_NAME/$GITHUB_SHA.zip
Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
name: Ahpuh CI Build & Test
2+
3+
on:
4+
push:
5+
branches:
6+
- master
7+
- develop
8+
pull_request:
9+
branches:
10+
- master
11+
- develop
12+
13+
jobs:
14+
build:
15+
runs-on: ubuntu-latest
16+
17+
steps:
18+
- uses: actions/checkout@v2
19+
20+
- name: Set up JDK 17
21+
uses: actions/setup-java@v1
22+
with:
23+
java-version: '17'
24+
25+
- name: Cache Gradle packages
26+
uses: actions/cache@v2
27+
with:
28+
path: |
29+
~/.gradle/caches
30+
~/.gradle/wrapper
31+
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
32+
restore-keys: |
33+
${{ runner.os }}-gradle-
34+
35+
- name: Grant execute permission for gradlew
36+
run: chmod +x gradlew
37+
shell: bash
38+
39+
- name: Build with Gradle
40+
run: ./gradlew clean build
41+
shell: bash
42+
43+
- name: Publish Unit Test Results
44+
uses: EnricoMi/publish-unit-test-result-action@v1
45+
if: ${{ always() }} # ν…ŒμŠ€νŠΈκ°€ μ‹€νŒ¨ν•΄λ„ Reportλ₯Ό 보기 μœ„ν•΄ always둜 μ„€μ •
46+
with:
47+
files: build/test-results/**/*.xml # Report μ €μž₯ 경둜
48+
49+
- name: Cleanup Gradle Cache
50+
if: ${{ always() }}
51+
run: |
52+
rm -f ~/.gradle/caches/modules-2/modules-2.lock
53+
rm -f ~/.gradle/caches/modules-2/gc.properties
54+
55+
### Testλ₯Ό ν†΅κ³Όν•΄μ•Όλ§Œ merge κ°€λŠ₯ν•˜κ²Œ μ„€μ • 방법 ###
56+
# Settings -> Branches -> Add rule
57+
# Branch name pattern (Branch name) μ„€μ •
58+
# Require status checks to pass before merging μ„€μ •

β€Ž.gitignoreβ€Ž

Lines changed: 2 additions & 88 deletions
Original file line numberDiff line numberDiff line change
@@ -1,56 +1,11 @@
1-
2-
# Created by https://www.toptal.com/developers/gitignore/api/gradle,intellij,java
3-
# Edit at https://www.toptal.com/developers/gitignore?templates=gradle,intellij,java
1+
/logs
42

53
### Intellij ###
6-
# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider
7-
# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
8-
9-
# User-specific stuff
10-
.idea/**/workspace.xml
11-
.idea/**/tasks.xml
12-
.idea/**/usage.statistics.xml
13-
.idea/**/dictionaries
14-
.idea/**/shelf
15-
16-
# AWS User-specific
17-
.idea/**/aws.xml
18-
19-
# Generated files
20-
.idea/**/contentModel.xml
21-
22-
# Sensitive or high-churn files
23-
.idea/**/dataSources/
24-
.idea/**/dataSources.ids
25-
.idea/**/dataSources.local.xml
26-
.idea/**/sqlDataSources.xml
27-
.idea/**/dynamic.xml
28-
.idea/**/uiDesigner.xml
29-
.idea/**/dbnavigator.xml
30-
31-
# Gradle
32-
.idea/**/gradle.xml
33-
.idea/**/libraries
34-
35-
# Gradle and Maven with auto-import
36-
# When using Gradle or Maven with auto-import, you should exclude module files,
37-
# since they will be recreated, and may cause churn. Uncomment if using
38-
# auto-import.
39-
# .idea/artifacts
40-
# .idea/compiler.xml
41-
# .idea/jarRepositories.xml
42-
# .idea/modules.xml
43-
# .idea/*.iml
44-
# .idea/modules
45-
# *.iml
46-
# *.ipr
4+
/.idea/
475

486
# CMake
497
cmake-build-*/
508

51-
# Mongo Explorer plugin
52-
.idea/**/mongoSettings.xml
53-
549
# File-based project format
5510
*.iws
5611

@@ -63,51 +18,12 @@ out/
6318
# JIRA plugin
6419
atlassian-ide-plugin.xml
6520

66-
# Cursive Clojure plugin
67-
.idea/replstate.xml
68-
6921
# Crashlytics plugin (for Android Studio and IntelliJ)
7022
com_crashlytics_export_strings.xml
7123
crashlytics.properties
7224
crashlytics-build.properties
7325
fabric.properties
7426

75-
# Editor-based Rest Client
76-
.idea/httpRequests
77-
78-
# Android studio 3.1+ serialized cache file
79-
.idea/caches/build_file_checksums.ser
80-
81-
### Intellij Patch ###
82-
# Comment Reason: https://github.com/joeblau/gitignore.io/issues/186#issuecomment-215987721
83-
84-
# *.iml
85-
# modules.xml
86-
# .idea/misc.xml
87-
# *.ipr
88-
89-
# Sonarlint plugin
90-
# https://plugins.jetbrains.com/plugin/7973-sonarlint
91-
.idea/**/sonarlint/
92-
93-
# SonarQube Plugin
94-
# https://plugins.jetbrains.com/plugin/7238-sonarqube-community-plugin
95-
.idea/**/sonarIssues.xml
96-
97-
# Markdown Navigator plugin
98-
# https://plugins.jetbrains.com/plugin/7896-markdown-navigator-enhanced
99-
.idea/**/markdown-navigator.xml
100-
.idea/**/markdown-navigator-enh.xml
101-
.idea/**/markdown-navigator/
102-
103-
# Cache file creation bug
104-
# See https://youtrack.jetbrains.com/issue/JBR-2257
105-
.idea/$CACHE_FILE$
106-
107-
# CodeStream plugin
108-
# https://plugins.jetbrains.com/plugin/12206-codestream
109-
.idea/codestream.xml
110-
11127
### Java ###
11228
# Compiled class file
11329
*.class
@@ -157,5 +73,3 @@ gradle-app.setting
15773
.project
15874
# JDT-specific (Eclipse Java Development Tools)
15975
.classpath
160-
161-
# End of https://www.toptal.com/developers/gitignore/api/gradle,intellij,java

β€Ž.idea/.gitignoreβ€Ž

Lines changed: 0 additions & 8 deletions
This file was deleted.

β€Ž.idea/.nameβ€Ž

Lines changed: 0 additions & 1 deletion
This file was deleted.

β€Ž.idea/compiler.xmlβ€Ž

Lines changed: 0 additions & 15 deletions
This file was deleted.

β€Ž.idea/jarRepositories.xmlβ€Ž

Lines changed: 0 additions & 25 deletions
This file was deleted.

β€Ž.idea/misc.xmlβ€Ž

Lines changed: 0 additions & 10 deletions
This file was deleted.

0 commit comments

Comments
Β (0)