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
66 changes: 36 additions & 30 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,40 +3,46 @@ name: CI
on:
push:
branches: [main]
pull_request:
branches: [main]

jobs:
build:
runs-on: ubuntu-latest

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

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

- name: Grant execute permission for gradlew
run: chmod +x ./gradlew

- name: Build with Gradle
run: ./gradlew build

- name: Run Tests with Coverage
run: ./gradlew jacocoTestReport

- name: Upload Coverage Report
uses: actions/upload-artifact@v4
with:
name: jacoco-html-report
path: build/reports/jacoco/test/html

- name: Upload coverage reports to Codecov
uses: codecov/codecov-action@v5
with:
token: ${{ secrets.CODECOV_TOKEN }}
- name: Checkout repository
uses: actions/checkout@v4

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

- name: Create application.yml
run: |
mkdir -p src/main/resources
echo "${{ secrets.APPLICATION_YML }}" > ./src/main/resources/application.yml
echo "${{ secrets.APPLICATION_YML_DEV }}" > ./src/main/resources/application-dev.yml
echo "${{ secrets.APPLICATION_YML_PROD }}" > ./src/main/resources/application-prod.yml
echo "${{ secrets.APPLICATION_YML_SECRET }}" > ./src/main/resources/application-secret.yml

- name: Grant execute permission for gradlew
run: chmod +x ./gradlew

- name: Build with Gradle
run: ./gradlew build

- name: Run Tests with Coverage
run: ./gradlew jacocoTestReport

- name: Upload Coverage Report
uses: actions/upload-artifact@v4
with:
name: jacoco-html-report
path: build/reports/jacoco/test/html

- name: Upload coverage reports to Codecov
uses: codecov/codecov-action@v5
with:
token: ${{ secrets.CODECOV_TOKEN }}

56 changes: 56 additions & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
name: PR Test
permissions:
contents: read
checks: write
issues: write
pull-requests: write

on:
pull_request:
branches: [ develop, main ]

jobs:
test:
runs-on: ubuntu-latest

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

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

- name: Create application.yml
run: |
mkdir -p src/main/resources
mkdir -p src/test/resources
echo "${{ secrets.APPLICATION_YML }}" > ./src/main/resources/application.yml
echo "${{ secrets.APPLICATION_YML_DEV }}" > ./src/main/resources/application-dev.yml
echo "${{ secrets.APPLICATION_YML_PROD }}" > ./src/main/resources/application-prod.yml
echo "${{ secrets.APPLICATION_YML_SECRET }}" > ./src/main/resources/application-secret.yml
echo "${{ secrets.APPLICATION_YML_TEST }}" > ./src/test/resources/application.yml

- name: Debug created files
run: |
echo "=== Checking if files exist ==="
ls -la src/main/resources/
ls -la src/test/resources/
echo "=== Main application.yml content ==="
cat ./src/main/resources/application.yml
echo "=== Test application.yml content ==="
cat ./src/test/resources/application.yml

- name: Grant execute permission for gradlew
run: chmod +x gradlew

# - name: Test with Gradle
# run: ./gradlew test --info
#
# - name: Publish Test Results
# uses: EnricoMi/publish-unit-test-result-action@v2
# if: ${{ always() }}
# with:
# files: build/test-results/**/*.xml
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ build/
src/main/resources/application-secret.yml
src/main/resources/application-dev.yml
src/main/resources/application-prod.yml
src/test/resources/application.yml

### STS ###
.apt_generated
Expand Down
4 changes: 1 addition & 3 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,6 @@ dependencies {
implementation 'org.springframework.boot:spring-boot-starter-validation'
implementation 'org.springframework.boot:spring-boot-starter-web'
implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.5.0'
// H2 ๋ฐ์ดํ„ฐ๋ฒ ์ด์Šค ์˜์กด์„ฑ (์ฃผ์„ ์ฒ˜๋ฆฌ)
runtimeOnly 'com.h2database:h2'
testImplementation 'com.h2database:h2'

// MySQL ์˜์กด์„ฑ
runtimeOnly 'com.mysql:mysql-connector-j'
Expand All @@ -45,6 +42,7 @@ dependencies {
annotationProcessor 'org.projectlombok:lombok'
testImplementation 'org.springframework.boot:spring-boot-starter-test'
testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
testImplementation("com.h2database:h2")

//oauth2
implementation 'org.springframework.boot:spring-boot-starter-oauth2-client'
Expand Down
1 change: 0 additions & 1 deletion src/main/java/com/blockcloud/domain/user/User.java
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.GenerationType;
import jakarta.persistence.Id;
import jakarta.persistence.Table;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Getter;
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/application.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@ spring:
application:
name: "BlockCloud Main Server API"
profiles:
active: prod
include: secret
active: dev