Skip to content

Chore: 브랜치명 변경 dev -> develop #9

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.

Sign up for GitHub

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

Merged
merged 3 commits into from
Mar 27, 2025
Merged

Chore: 브랜치명 변경 dev -> develop #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
612e2f5
chore: 브랜치명 변경 dev -> develop
sapiens2000 Mar 27, 2025
5081136
chore: develop 으로 pr 시 자코코 분석
sapiens2000 Mar 27, 2025
9133254
chore: sonarcloud branch 설정 변경
sapiens2000 Mar 27, 2025
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
5 changes: 3 additions & 2 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,11 @@ name: log4u-build
on:
# push:
# branches:
# - dev # dev 브랜치 push
# - develop # dev 브랜치 push
pull_request:
branches:
- main # main pr
- develop # develop pr
types: [ opened, synchronize, reopened ]
jobs:
build:
Expand Down Expand Up @@ -41,4 +42,4 @@ jobs:
DB_PASSWORD: ${{ secrets.DB_PASSWORD }} # Database password
run: |
chmod +x ./gradlew
./gradlew build jacocoTestReport sonar --info
./gradlew build jacocoTestReport sonar --info -Dsonar.branch.name=${{ github.ref_name }}
4 changes: 2 additions & 2 deletions .github/workflows/daily-archive.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:

- name: Create new archive branch
run: |
git checkout dev
git pull origin dev
git checkout develop
git pull origin develop
git checkout -b ${{ env.BRANCH_NAME }}
git push origin ${{ env.BRANCH_NAME }}
1 change: 1 addition & 0 deletions build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,5 +74,6 @@ sonar {
property("sonar.host.url", "https://sonarcloud.io")
property("sonar.coverage.jacoco.xmlReportPaths", "build/reports/jacoco/test/jacocoTestReport.xml")
property("sonar.java.checkstyle.reportPaths", "build/reports/checkstyle/main.xml")
property("sonar.branch.name", System.getenv("BRANCH_NAME") ?: "main")
}
}