diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ca8c9427..53ba9c8d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -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: @@ -41,4 +42,4 @@ jobs: DB_PASSWORD: ${{ secrets.DB_PASSWORD }} # Database password run: | chmod +x ./gradlew - ./gradlew build jacocoTestReport sonar --info \ No newline at end of file + ./gradlew build jacocoTestReport sonar --info -Dsonar.branch.name=${{ github.ref_name }} \ No newline at end of file diff --git a/.github/workflows/daily-archive.yml b/.github/workflows/daily-archive.yml index a201e782..aba01d3a 100644 --- a/.github/workflows/daily-archive.yml +++ b/.github/workflows/daily-archive.yml @@ -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 }} \ No newline at end of file diff --git a/build.gradle.kts b/build.gradle.kts index 0ad7d420..cda4496d 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -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") } } \ No newline at end of file