diff --git a/Jenkinsfile b/Jenkinsfile index 24339c5..fa870e9 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -73,7 +73,7 @@ pipeline { if (isNotificationNecessary()) { mineRepository() emailext attachLog: true, body: email_content(), subject: email_subject(), to: 'junoyoon@gmail.com' - slackSend(channel: "#jenkins", message: "${custom_msg(currentBuild.currentResult)}") + // slackSend(channel: "#jenkins", message: "${custom_msg(currentBuild.currentResult)}") } } } diff --git a/Jenkinsfile-build b/Jenkinsfile-build index f52ed39..cb6c6e8 100644 --- a/Jenkinsfile-build +++ b/Jenkinsfile-build @@ -105,7 +105,7 @@ pipeline { jacoco sourcePattern: '**/src/main/kotlin' mineRepository() emailext attachLog: true, body: email_content(), subject: email_subject(), to: 'junoyoon@gmail.com' - slackSend channel: "#jenkins", message: "${custom_msg(currentBuild.currentResult)}" + //slackSend channel: "#jenkins", message: "${custom_msg(currentBuild.currentResult)}" } diff --git a/README.md b/README.md index 12a0b7d..1278986 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,5 @@ # fastcampus-jenkins -# fastcampus-jenkins +# fastcampus-jenkins!!!!12 + + + diff --git a/projects/spring-app/build.gradle.kts b/projects/spring-app/build.gradle.kts index 2997cf8..0ae87b7 100644 --- a/projects/spring-app/build.gradle.kts +++ b/projects/spring-app/build.gradle.kts @@ -1,5 +1,5 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile -// import org.jlleitschuh.gradle.ktlint.reporter.ReporterType +import org.jlleitschuh.gradle.ktlint.reporter.ReporterType plugins { id("org.springframework.boot") version "2.7.12" @@ -7,7 +7,7 @@ plugins { id("org.jlleitschuh.gradle.ktlint") version "11.3.2" kotlin("jvm") version "1.6.21" kotlin("plugin.spring") version "1.6.21" - // jacoco + jacoco } group = "com.fastcampus" @@ -37,8 +37,8 @@ tasks.withType { useJUnitPlatform() } -// configure { -// reporters { -// reporter(ReporterType.CHECKSTYLE) -// } -// } +configure { + reporters { + reporter(ReporterType.CHECKSTYLE) + } +} diff --git "a/\354\213\244\354\212\265\354\212\244\355\201\254\353\246\275\355\212\270/chapter-6/2-MultibranchPipeline\354\213\244\354\212\265-advanced.txt" "b/\354\213\244\354\212\265\354\212\244\355\201\254\353\246\275\355\212\270/chapter-6/2-MultibranchPipeline\354\213\244\354\212\265-advanced.txt" index 75c9754..280fbb7 100644 --- "a/\354\213\244\354\212\265\354\212\244\355\201\254\353\246\275\355\212\270/chapter-6/2-MultibranchPipeline\354\213\244\354\212\265-advanced.txt" +++ "b/\354\213\244\354\212\265\354\212\244\355\201\254\353\246\275\355\212\270/chapter-6/2-MultibranchPipeline\354\213\244\354\212\265-advanced.txt" @@ -4,7 +4,7 @@ triggers { issueCommentTrigger('.*(test this|build this|deploy this).*') } - + - PR 에 커멘트 입력시 빌드 시작 여부 확인 * PR Commit 메시지가 deploy this 일때 배포되도록 수정 diff --git "a/\354\213\244\354\212\265\354\212\244\355\201\254\353\246\275\355\212\270/chapter-6/2-MultibranchPipeline\354\213\244\354\212\265.txt" "b/\354\213\244\354\212\265\354\212\244\355\201\254\353\246\275\355\212\270/chapter-6/2-MultibranchPipeline\354\213\244\354\212\265.txt" index 93751ec..37a00fb 100644 --- "a/\354\213\244\354\212\265\354\212\244\355\201\254\353\246\275\355\212\270/chapter-6/2-MultibranchPipeline\354\213\244\354\212\265.txt" +++ "b/\354\213\244\354\212\265\354\212\244\355\201\254\353\246\275\355\212\270/chapter-6/2-MultibranchPipeline\354\213\244\354\212\265.txt" @@ -215,4 +215,4 @@ def isPr() { * main 에 직접 커밋, 빌드 확인 * PR 생성후, 빌드 확인 - - 커멘트 추가, 빌드 미동작 확인 \ No newline at end of file + - 커멘트 추가, 빌드 미동작 확인