Merge pull request #9 from prgrms-web-devcourse-final-project/feature/github-action

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

Author: sapiens2000

.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
+          ./gradlew build jacocoTestReport sonar --info -Dsonar.branch.name=${{ github.ref_name }}

.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 }}

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")
     }
 }