From a7146eb611f1d2cd8fb7222bdd0cd3b379936e6e Mon Sep 17 00:00:00 2001 From: thijore <103062967+thijore@users.noreply.github.com> Date: Sat, 25 Jun 2022 13:11:50 +0530 Subject: [PATCH 1/9] introduced bug --- .../taylor/timetracker/core/TrackerCoreConfigTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/src/test/java/training/taylor/timetracker/core/TrackerCoreConfigTest.java b/core/src/test/java/training/taylor/timetracker/core/TrackerCoreConfigTest.java index b4652777b..f933acdbb 100644 --- a/core/src/test/java/training/taylor/timetracker/core/TrackerCoreConfigTest.java +++ b/core/src/test/java/training/taylor/timetracker/core/TrackerCoreConfigTest.java @@ -1,8 +1,8 @@ package training.taylor.timetracker.core; -import static org.junit.Assert.*; +//import static org.junit.Assert.*; -import org.junit.Test; +//import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.ContextConfiguration; From 92d421f5f7bb63fe597fda4c7716d34b3838521a Mon Sep 17 00:00:00 2001 From: thijore <103062967+thijore@users.noreply.github.com> Date: Sat, 25 Jun 2022 13:17:02 +0530 Subject: [PATCH 2/9] o --- .../taylor/timetracker/core/TrackerCoreConfigTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/src/test/java/training/taylor/timetracker/core/TrackerCoreConfigTest.java b/core/src/test/java/training/taylor/timetracker/core/TrackerCoreConfigTest.java index f933acdbb..b4652777b 100644 --- a/core/src/test/java/training/taylor/timetracker/core/TrackerCoreConfigTest.java +++ b/core/src/test/java/training/taylor/timetracker/core/TrackerCoreConfigTest.java @@ -1,8 +1,8 @@ package training.taylor.timetracker.core; -//import static org.junit.Assert.*; +import static org.junit.Assert.*; -//import org.junit.Test; +import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.ContextConfiguration; From a52b21517f0c88770199896f9cba44fbef9274be Mon Sep 17 00:00:00 2001 From: thijore <103062967+thijore@users.noreply.github.com> Date: Fri, 9 Sep 2022 23:40:41 +0530 Subject: [PATCH 3/9] Update .gitignore --- .gitignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 4eb0cb06f..3942b03ec 100644 --- a/.gitignore +++ b/.gitignore @@ -7,4 +7,5 @@ release.properties dependency-reduced-pom.xml buildNumber.properties .idea -*.iml \ No newline at end of file +*.iml +GH From 7e3e74b5dced9eecf17115096b352db86610abdf Mon Sep 17 00:00:00 2001 From: EC2 Default User Date: Thu, 15 Sep 2022 16:46:54 +0000 Subject: [PATCH 4/9] ggg --- demo | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 demo diff --git a/demo b/demo new file mode 100644 index 000000000..e69de29bb From 81b5b745b56790bbed2657a2fe824875df60d97d Mon Sep 17 00:00:00 2001 From: thijore <103062967+thijore@users.noreply.github.com> Date: Thu, 15 Sep 2022 22:19:07 +0530 Subject: [PATCH 5/9] Update demo --- demo | 1 + 1 file changed, 1 insertion(+) diff --git a/demo b/demo index e69de29bb..0c0da3ecb 100644 --- a/demo +++ b/demo @@ -0,0 +1 @@ +hiii From fe110bc1ec6a590396f2353d08c4589cacbca42f Mon Sep 17 00:00:00 2001 From: thijore <103062967+thijore@users.noreply.github.com> Date: Sat, 17 Sep 2022 11:38:20 +0530 Subject: [PATCH 6/9] Create Jenkinsfile --- Jenkinsfile | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 Jenkinsfile diff --git a/Jenkinsfile b/Jenkinsfile new file mode 100644 index 000000000..dea701514 --- /dev/null +++ b/Jenkinsfile @@ -0,0 +1,10 @@ +pipeline { + agent any + stages { + stage ('build') { + step { + "echo how r u" + } + } + } +} From 0f2d9ed98afbcc3cf75a991827751f67d317e25e Mon Sep 17 00:00:00 2001 From: thijore <103062967+thijore@users.noreply.github.com> Date: Sat, 17 Sep 2022 11:39:57 +0530 Subject: [PATCH 7/9] Update Jenkinsfile --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index dea701514..43ce63fdf 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -2,7 +2,7 @@ pipeline { agent any stages { stage ('build') { - step { + steps { "echo how r u" } } From d93af7202b6fced8da14116d45720e45e1e96374 Mon Sep 17 00:00:00 2001 From: thijore <103062967+thijore@users.noreply.github.com> Date: Sat, 17 Sep 2022 11:42:00 +0530 Subject: [PATCH 8/9] Update Jenkinsfile --- Jenkinsfile | 47 +++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 39 insertions(+), 8 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 43ce63fdf..80867d2ee 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,10 +1,41 @@ pipeline { - agent any - stages { - stage ('build') { - steps { - "echo how r u" - } + agent none + stages { + stage('Build') { + agent any + steps { + checkout scm + sh 'make' + stash includes: '**/target/*.jar', name: 'app' + } + } + stage('Test on Linux') { + agent { + label 'linux' + } + steps { + unstash 'app' + sh 'make check' + } + post { + always { + junit '**/target/*.xml' + } + } + } + stage('Test on Windows') { + agent { + label 'windows' + } + steps { + unstash 'app' + bat 'make check' + } + post { + always { + junit '**/target/*.xml' + } + } + } } - } -} +} From b5395fe9360a2d8411024232d18f6fe0411aef55 Mon Sep 17 00:00:00 2001 From: thijore <103062967+thijore@users.noreply.github.com> Date: Sat, 17 Sep 2022 11:43:07 +0530 Subject: [PATCH 9/9] Update Jenkinsfile --- Jenkinsfile | 34 +++++++--------------------------- 1 file changed, 7 insertions(+), 27 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 80867d2ee..b9822500b 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,40 +1,20 @@ pipeline { - agent none + agent any + stages { stage('Build') { - agent any steps { - checkout scm - sh 'make' - stash includes: '**/target/*.jar', name: 'app' + echo 'Building..' } } - stage('Test on Linux') { - agent { - label 'linux' - } + stage('Test') { steps { - unstash 'app' - sh 'make check' - } - post { - always { - junit '**/target/*.xml' - } + echo 'Testing..' } } - stage('Test on Windows') { - agent { - label 'windows' - } + stage('Deploy') { steps { - unstash 'app' - bat 'make check' - } - post { - always { - junit '**/target/*.xml' - } + echo 'Deploying....' } } }