From 8554f65b43f13e043780e02b786d713e1af59b32 Mon Sep 17 00:00:00 2001 From: sunwondx <104117486+sunwondx@users.noreply.github.com> Date: Mon, 25 Sep 2023 14:57:12 +0900 Subject: [PATCH 01/17] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 12a0b7d..2b511a4 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,2 @@ # fastcampus-jenkins -# fastcampus-jenkins +# fastcampus-jenkins!! From aa9269fecadf0d71bab9078bf38f60450ffd271b Mon Sep 17 00:00:00 2001 From: sunwondx <104117486+sunwondx@users.noreply.github.com> Date: Mon, 25 Sep 2023 17:50:38 +0900 Subject: [PATCH 02/17] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 2b511a4..dd56b8f 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,2 @@ # fastcampus-jenkins -# fastcampus-jenkins!! +# fastcampus-jenkins!!! From 49dafefa08b8d26c3993f4817baa360a3f2db019 Mon Sep 17 00:00:00 2001 From: sunwondx <104117486+sunwondx@users.noreply.github.com> Date: Tue, 26 Sep 2023 18:46:55 +0900 Subject: [PATCH 03/17] Update build.gradle.kts --- projects/spring-app/build.gradle.kts | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/projects/spring-app/build.gradle.kts b/projects/spring-app/build.gradle.kts index 2997cf8..e9f3001 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" @@ -37,8 +37,8 @@ tasks.withType { useJUnitPlatform() } -// configure { -// reporters { -// reporter(ReporterType.CHECKSTYLE) -// } -// } +configure { + reporters { + reporter(ReporterType.CHECKSTYLE) + } +} From 225f1783f1db4a78ddb07c2dc22e997599c16d7f Mon Sep 17 00:00:00 2001 From: sunwondx <104117486+sunwondx@users.noreply.github.com> Date: Tue, 26 Sep 2023 18:48:35 +0900 Subject: [PATCH 04/17] Update build.gradle.kts --- projects/spring-app/build.gradle.kts | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/projects/spring-app/build.gradle.kts b/projects/spring-app/build.gradle.kts index e9f3001..2997cf8 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" @@ -37,8 +37,8 @@ tasks.withType { useJUnitPlatform() } -configure { - reporters { - reporter(ReporterType.CHECKSTYLE) - } -} +// configure { +// reporters { +// reporter(ReporterType.CHECKSTYLE) +// } +// } From 292cb218c0790e0df4390a38ef904dccc659e83e Mon Sep 17 00:00:00 2001 From: sunwondx <104117486+sunwondx@users.noreply.github.com> Date: Tue, 26 Sep 2023 18:50:18 +0900 Subject: [PATCH 05/17] Update build.gradle.kts --- projects/spring-app/build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/spring-app/build.gradle.kts b/projects/spring-app/build.gradle.kts index 2997cf8..ca23e58 100644 --- a/projects/spring-app/build.gradle.kts +++ b/projects/spring-app/build.gradle.kts @@ -4,7 +4,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { id("org.springframework.boot") version "2.7.12" id("io.spring.dependency-management") version "1.0.15.RELEASE" - id("org.jlleitschuh.gradle.ktlint") version "11.3.2" + id("org.jlleitschuh.gradle.ktlint") version "11.6.0" kotlin("jvm") version "1.6.21" kotlin("plugin.spring") version "1.6.21" // jacoco From f4999db4290776ef032b0ff3bdd24fdb2b046ba8 Mon Sep 17 00:00:00 2001 From: sunwondx <104117486+sunwondx@users.noreply.github.com> Date: Tue, 26 Sep 2023 19:43:46 +0900 Subject: [PATCH 06/17] =?UTF-8?q?Update=202-MultibranchPipeline=EC=8B=A4?= =?UTF-8?q?=EC=8A=B5.txt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../2-MultibranchPipeline\354\213\244\354\212\265.txt" | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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..4c83cf9 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" @@ -104,9 +104,9 @@ pipeline { post { always { - scanForIssues tool: ktLint(pattern: '**/ktlint/**/*.xml') - junit '**/test-results/**/*.xml' - jacoco sourcePattern: '**/src/main/kotlin' + //scanForIssues tool: ktLint(pattern: '**/ktlint/**/*.xml') + //junit '**/test-results/**/*.xml' + //jacoco sourcePattern: '**/src/main/kotlin' script { mineRepository() emailext attachLog: true, body: email_content(), subject: email_subject(), to: '[각자의이메일주소]' @@ -215,4 +215,4 @@ def isPr() { * main 에 직접 커밋, 빌드 확인 * PR 생성후, 빌드 확인 - - 커멘트 추가, 빌드 미동작 확인 \ No newline at end of file + - 커멘트 추가, 빌드 미동작 확인 From 8222eac0107bb38e895a0b46aecf80c23b44fafb Mon Sep 17 00:00:00 2001 From: sunwondx <104117486+sunwondx@users.noreply.github.com> Date: Tue, 26 Sep 2023 19:44:56 +0900 Subject: [PATCH 07/17] =?UTF-8?q?Update=202-MultibranchPipeline=EC=8B=A4?= =?UTF-8?q?=EC=8A=B5.txt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../2-MultibranchPipeline\354\213\244\354\212\265.txt" | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 4c83cf9..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" @@ -104,9 +104,9 @@ pipeline { post { always { - //scanForIssues tool: ktLint(pattern: '**/ktlint/**/*.xml') - //junit '**/test-results/**/*.xml' - //jacoco sourcePattern: '**/src/main/kotlin' + scanForIssues tool: ktLint(pattern: '**/ktlint/**/*.xml') + junit '**/test-results/**/*.xml' + jacoco sourcePattern: '**/src/main/kotlin' script { mineRepository() emailext attachLog: true, body: email_content(), subject: email_subject(), to: '[각자의이메일주소]' From 85c68d00298ca36a93c54ea1b34377472badaba3 Mon Sep 17 00:00:00 2001 From: sunwondx <104117486+sunwondx@users.noreply.github.com> Date: Tue, 26 Sep 2023 20:48:41 +0900 Subject: [PATCH 08/17] Update build.gradle.kts --- projects/spring-app/build.gradle.kts | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/projects/spring-app/build.gradle.kts b/projects/spring-app/build.gradle.kts index ca23e58..7625b5c 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" @@ -37,8 +37,8 @@ tasks.withType { useJUnitPlatform() } -// configure { -// reporters { -// reporter(ReporterType.CHECKSTYLE) -// } -// } +configure { + reporters { + reporter(ReporterType.CHECKSTYLE) + } +} From 8d8e9065b245aa30436e035f627164060a951928 Mon Sep 17 00:00:00 2001 From: sunwondx <104117486+sunwondx@users.noreply.github.com> Date: Tue, 26 Sep 2023 20:51:16 +0900 Subject: [PATCH 09/17] Update build.gradle.kts --- projects/spring-app/build.gradle.kts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/projects/spring-app/build.gradle.kts b/projects/spring-app/build.gradle.kts index 7625b5c..94d43d7 100644 --- a/projects/spring-app/build.gradle.kts +++ b/projects/spring-app/build.gradle.kts @@ -38,7 +38,7 @@ tasks.withType { } configure { - reporters { - reporter(ReporterType.CHECKSTYLE) - } + reporters { + reporter(ReporterType.CHECKSTYLE) + } } From 4bb65d1ac1134cdbc2c212ef522bc0e179756b89 Mon Sep 17 00:00:00 2001 From: sunwondx <104117486+sunwondx@users.noreply.github.com> Date: Tue, 26 Sep 2023 20:52:40 +0900 Subject: [PATCH 10/17] Update build.gradle.kts --- projects/spring-app/build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/spring-app/build.gradle.kts b/projects/spring-app/build.gradle.kts index 94d43d7..a8e58e2 100644 --- a/projects/spring-app/build.gradle.kts +++ b/projects/spring-app/build.gradle.kts @@ -7,7 +7,7 @@ plugins { id("org.jlleitschuh.gradle.ktlint") version "11.6.0" kotlin("jvm") version "1.6.21" kotlin("plugin.spring") version "1.6.21" - // jacoco + jacoco } group = "com.fastcampus" From 78d7289111944970ec24160f4b8421fef8f60c33 Mon Sep 17 00:00:00 2001 From: sunwondx <104117486+sunwondx@users.noreply.github.com> Date: Tue, 26 Sep 2023 20:55:05 +0900 Subject: [PATCH 11/17] Update build.gradle.kts --- projects/spring-app/build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/spring-app/build.gradle.kts b/projects/spring-app/build.gradle.kts index a8e58e2..0ae87b7 100644 --- a/projects/spring-app/build.gradle.kts +++ b/projects/spring-app/build.gradle.kts @@ -4,7 +4,7 @@ import org.jlleitschuh.gradle.ktlint.reporter.ReporterType plugins { id("org.springframework.boot") version "2.7.12" id("io.spring.dependency-management") version "1.0.15.RELEASE" - id("org.jlleitschuh.gradle.ktlint") version "11.6.0" + id("org.jlleitschuh.gradle.ktlint") version "11.3.2" kotlin("jvm") version "1.6.21" kotlin("plugin.spring") version "1.6.21" jacoco From 0345fe10757c62702eb9e14387735cc48714f92a Mon Sep 17 00:00:00 2001 From: sunwondx <104117486+sunwondx@users.noreply.github.com> Date: Sat, 30 Sep 2023 14:18:47 +0900 Subject: [PATCH 12/17] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index dd56b8f..e44c78c 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,2 @@ # fastcampus-jenkins -# fastcampus-jenkins!!! +# fastcampus-jenkins!!!! From e145aeb3b6c85bea23c037efe8d047ad3a07ea07 Mon Sep 17 00:00:00 2001 From: sunwondx <104117486+sunwondx@users.noreply.github.com> Date: Sat, 30 Sep 2023 15:55:32 +0900 Subject: [PATCH 13/17] Update Jenkinsfile-build --- Jenkinsfile-build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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)}" } From 2b685fdeedb9b4ccf6dc7c34aa39612164f6bf00 Mon Sep 17 00:00:00 2001 From: sunwondx <104117486+sunwondx@users.noreply.github.com> Date: Sat, 30 Sep 2023 18:03:25 +0900 Subject: [PATCH 14/17] Update README.md --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index e44c78c..5a3e599 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,5 @@ # fastcampus-jenkins # fastcampus-jenkins!!!! + + + From 0e4242fdc455b7fd3ccf0ba56f782c35d3bb3ec3 Mon Sep 17 00:00:00 2001 From: sunwondx <104117486+sunwondx@users.noreply.github.com> Date: Sat, 30 Sep 2023 18:17:12 +0900 Subject: [PATCH 15/17] =?UTF-8?q?Update=202-MultibranchPipeline=EC=8B=A4?= =?UTF-8?q?=EC=8A=B5-advanced.txt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../2-MultibranchPipeline\354\213\244\354\212\265-advanced.txt" | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 일때 배포되도록 수정 From 9c3f9767bf6d009c7a705ee633232e2bebf01ed5 Mon Sep 17 00:00:00 2001 From: sunwondx <104117486+sunwondx@users.noreply.github.com> Date: Sat, 30 Sep 2023 18:19:27 +0900 Subject: [PATCH 16/17] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 5a3e599..1278986 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ # fastcampus-jenkins -# fastcampus-jenkins!!!! +# fastcampus-jenkins!!!!12 From 136cc233a3c75a136e0107459654684017f38188 Mon Sep 17 00:00:00 2001 From: sunwondx <104117486+sunwondx@users.noreply.github.com> Date: Sat, 30 Sep 2023 18:21:03 +0900 Subject: [PATCH 17/17] Update Jenkinsfile --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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)}") } } }