From a990d17d984185225c88078259b651c266dbcf23 Mon Sep 17 00:00:00 2001 From: NicholasMariga Date: Wed, 26 Mar 2025 22:29:56 +0300 Subject: [PATCH 1/9] Added a branch and Editted a Jenkinsfile --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index e96e37f..62f38b7 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -9,7 +9,7 @@ pipeline{ stage("Clone Repo"){ steps{ - git branch:'master', url:'https://github.com/kadimasum/java-todo' + git branch:'master', url:'https://github.com/NicholasMariga/java-todo.git' } } From 447f09d2b2f0b6536321c849294b1d421ad5e001 Mon Sep 17 00:00:00 2001 From: NicholasMariga Date: Wed, 26 Mar 2025 22:35:54 +0300 Subject: [PATCH 2/9] Editted README --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index e46e0bc..23cb0ce 100644 --- a/README.md +++ b/README.md @@ -12,4 +12,6 @@ Each branch contains a new "Step" of code. Please fork, then clone. 7. Change 7 8. Change 8 9. Change 9 -10. Change 10 \ No newline at end of file +10. Change 10 + +Added my test branch \ No newline at end of file From e5384df178f0972d664b03403868ddc39c7eeef7 Mon Sep 17 00:00:00 2001 From: NicholasMariga Date: Wed, 26 Mar 2025 22:40:53 +0300 Subject: [PATCH 3/9] Editted JeenkinsFile --- Jenkinsfile | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Jenkinsfile b/Jenkinsfile index 84c7054..60c5e39 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -21,5 +21,10 @@ pipeline{ sh "gradle test" } } + stage("Archive"){ + steps{ + sh "echeo 'Archiving the build'" + } + } } } From 2e209e40fd5324b61200e28579e4183234f66fab Mon Sep 17 00:00:00 2001 From: NicholasMariga Date: Wed, 26 Mar 2025 22:48:45 +0300 Subject: [PATCH 4/9] test file --- testfile | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 testfile diff --git a/testfile b/testfile new file mode 100644 index 0000000..e69de29 From 5b8bbbf9db10f88c07b1983f6e25ddded2aa5b30 Mon Sep 17 00:00:00 2001 From: NicholasMariga Date: Wed, 26 Mar 2025 23:03:24 +0300 Subject: [PATCH 5/9] test file 2 --- testfile2 | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 testfile2 diff --git a/testfile2 b/testfile2 new file mode 100644 index 0000000..e69de29 From 2de0a53fbd3a5fa3b06fc3b46071ff54c2838257 Mon Sep 17 00:00:00 2001 From: NicholasMariga Date: Wed, 26 Mar 2025 23:12:40 +0300 Subject: [PATCH 6/9] test file 3 --- testfile3 | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 testfile3 diff --git a/testfile3 b/testfile3 new file mode 100644 index 0000000..e69de29 From 67e188e7300a5b5e6b76e82ecd60a66d2fa38fc7 Mon Sep 17 00:00:00 2001 From: NicholasMariga Date: Thu, 27 Mar 2025 18:59:24 +0300 Subject: [PATCH 7/9] Editted Jenkinsfile --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 60c5e39..626901f 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -23,7 +23,7 @@ pipeline{ } stage("Archive"){ steps{ - sh "echeo 'Archiving the build'" + sh "echo 'Archiving the build'" } } } From cc0b832f8b565bd7e931db5583d9c2d6c4848ef7 Mon Sep 17 00:00:00 2001 From: NicholasMariga Date: Thu, 27 Mar 2025 19:06:35 +0300 Subject: [PATCH 8/9] Editted Readme --- README.md | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 8649ae7..6f00421 100644 --- a/README.md +++ b/README.md @@ -13,9 +13,12 @@ Each branch contains a new "Step" of code. Please fork, then clone. 8. Change 8 9. Change 9 10. Change 10 -<<<<<<< HEAD -Added my test branch -======= + 11. Change 11 ->>>>>>> 9e0d1bfebc2bd95bcd7b62d520ec7a7328c6963f + +Added my test branch + +Added my test branch +Added my test branch +Added my test branch From 2fb4c0682ba979aa9e73d057a9dff414ba1d6a66 Mon Sep 17 00:00:00 2001 From: NicholasMariga Date: Thu, 27 Mar 2025 19:09:34 +0300 Subject: [PATCH 9/9] Editted Readme 2 --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index 6f00421..56ad6f3 100644 --- a/README.md +++ b/README.md @@ -22,3 +22,6 @@ Added my test branch Added my test branch Added my test branch Added my test branch + +**************** +****************