From 70ecefd43ac3c8c76b1ebfe27035a52af1ceb7a6 Mon Sep 17 00:00:00 2001
From: Colin DAMON <cdamon@ippon.fr>
Date: Sun, 2 Aug 2020 11:18:47 +0200
Subject: [PATCH] Fix build trigerring && project name norme
---
.gitlab-ci.yml | 6 +++---
.gitlab-common-ci.yml | 8 --------
README.md | 6 +++---
roman-numerals/.gitlab-ci.yml | 12 ++++++++++++
{romanNumerals => roman-numerals}/README.md | 0
{romanNumerals => roman-numerals}/pom.xml | 0
.../src/main/java/fr/ippon/kata/roman/Numerals.java | 0
.../src/main/java/fr/ippon/kata/roman/Roman.java | 0
.../test/java/fr/ippon/kata/roman/NumeralsTest.java | 0
romanNumerals/.gitlab-ci.yml | 4 ----
string-calculator/.gitlab-ci.yml | 12 ++++++++++++
{stringCalculator => string-calculator}/README.md | 0
{stringCalculator => string-calculator}/pom.xml | 0
.../java/fr/ippon/stringcalculator/Calculator.java | 0
.../fr/ippon/stringcalculator/CalculatorTest.java | 0
stringCalculator/.gitlab-ci.yml | 4 ----
word-wrap/.gitlab-ci.yml | 12 ++++++++++++
{wordWrap => word-wrap}/README.md | 0
{wordWrap => word-wrap}/pom.xml | 0
.../src/main/java/fr/ippon/kata/wrapper/Wrapper.java | 0
.../test/java/fr/ippon/kata/wrapper/WrapperTest.java | 0
wordWrap/.gitlab-ci.yml | 4 ----
22 files changed, 42 insertions(+), 26 deletions(-)
create mode 100644 roman-numerals/.gitlab-ci.yml
rename {romanNumerals => roman-numerals}/README.md (100%)
rename {romanNumerals => roman-numerals}/pom.xml (100%)
rename {romanNumerals => roman-numerals}/src/main/java/fr/ippon/kata/roman/Numerals.java (100%)
rename {romanNumerals => roman-numerals}/src/main/java/fr/ippon/kata/roman/Roman.java (100%)
rename {romanNumerals => roman-numerals}/src/test/java/fr/ippon/kata/roman/NumeralsTest.java (100%)
delete mode 100644 romanNumerals/.gitlab-ci.yml
create mode 100644 string-calculator/.gitlab-ci.yml
rename {stringCalculator => string-calculator}/README.md (100%)
rename {stringCalculator => string-calculator}/pom.xml (100%)
rename {stringCalculator => string-calculator}/src/main/java/fr/ippon/stringcalculator/Calculator.java (100%)
rename {stringCalculator => string-calculator}/src/test/java/fr/ippon/stringcalculator/CalculatorTest.java (100%)
delete mode 100644 stringCalculator/.gitlab-ci.yml
create mode 100644 word-wrap/.gitlab-ci.yml
rename {wordWrap => word-wrap}/README.md (100%)
rename {wordWrap => word-wrap}/pom.xml (100%)
rename {wordWrap => word-wrap}/src/main/java/fr/ippon/kata/wrapper/Wrapper.java (100%)
rename {wordWrap => word-wrap}/src/test/java/fr/ippon/kata/wrapper/WrapperTest.java (100%)
delete mode 100644 wordWrap/.gitlab-ci.yml
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5b00776b..ed28efde 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,6 +3,6 @@ stages:
include:
- local: "/.gitlab-common-ci.yml"
- - local: "/wordWrap/.gitlab-ci.yml"
- - local: "/romanNumerals/.gitlab-ci.yml"
- - local: "/stringCalculator/.gitlab-ci.yml"
+ - local: "/word-wrap/.gitlab-ci.yml"
+ - local: "/roman-numerals/.gitlab-ci.yml"
+ - local: "/string-calculator/.gitlab-ci.yml"
diff --git a/.gitlab-common-ci.yml b/.gitlab-common-ci.yml
index ce6c17fa..3715f7da 100644
--- a/.gitlab-common-ci.yml
+++ b/.gitlab-common-ci.yml
@@ -27,12 +27,4 @@ cache:
- $PROJECT_FOLDER/target/site/jacoco
name: "$PROJECT_FOLDER-report"
expire_in: 1 day
- only:
- refs:
- - master
- - merge_requests
- changes:
- - ".gitlab-ci.yml"
- - ".gitlab-common-ci.yml"
- - "$PROJECT_FOLDER/**/*"
coverage: "/([^%]+) %covered/"
diff --git a/README.md b/README.md
index 1a0f9f4d..2857b572 100644
--- a/README.md
+++ b/README.md
@@ -15,6 +15,6 @@ Ce dépôt Git a pour but de partager les différents ateliers pouvant être ré
## Kata Live Coding
-1. [WordWrap](/wordWrap)
-2. [RomanNumerals](/romanNumerals)
-3. [StringCalculator](/stringCalculator)
+1. [WordWrap](/word-wrap)
+2. [RomanNumerals](/roman-numerals)
+3. [StringCalculator](/string-calculator)
diff --git a/roman-numerals/.gitlab-ci.yml b/roman-numerals/.gitlab-ci.yml
new file mode 100644
index 00000000..7f6a885b
--- /dev/null
+++ b/roman-numerals/.gitlab-ci.yml
@@ -0,0 +1,12 @@
+package-roman-numerals:
+ variables:
+ PROJECT_FOLDER: "roman-numerals"
+ extends: .java
+ only:
+ refs:
+ - master
+ - merge_requests
+ changes:
+ - ".gitlab-ci.yml"
+ - ".gitlab-common-ci.yml"
+ - "roman-numerals/**/*"
diff --git a/romanNumerals/README.md b/roman-numerals/README.md
similarity index 100%
rename from romanNumerals/README.md
rename to roman-numerals/README.md
diff --git a/romanNumerals/pom.xml b/roman-numerals/pom.xml
similarity index 100%
rename from romanNumerals/pom.xml
rename to roman-numerals/pom.xml
diff --git a/romanNumerals/src/main/java/fr/ippon/kata/roman/Numerals.java b/roman-numerals/src/main/java/fr/ippon/kata/roman/Numerals.java
similarity index 100%
rename from romanNumerals/src/main/java/fr/ippon/kata/roman/Numerals.java
rename to roman-numerals/src/main/java/fr/ippon/kata/roman/Numerals.java
diff --git a/romanNumerals/src/main/java/fr/ippon/kata/roman/Roman.java b/roman-numerals/src/main/java/fr/ippon/kata/roman/Roman.java
similarity index 100%
rename from romanNumerals/src/main/java/fr/ippon/kata/roman/Roman.java
rename to roman-numerals/src/main/java/fr/ippon/kata/roman/Roman.java
diff --git a/romanNumerals/src/test/java/fr/ippon/kata/roman/NumeralsTest.java b/roman-numerals/src/test/java/fr/ippon/kata/roman/NumeralsTest.java
similarity index 100%
rename from romanNumerals/src/test/java/fr/ippon/kata/roman/NumeralsTest.java
rename to roman-numerals/src/test/java/fr/ippon/kata/roman/NumeralsTest.java
diff --git a/romanNumerals/.gitlab-ci.yml b/romanNumerals/.gitlab-ci.yml
deleted file mode 100644
index 9f5015b5..00000000
--- a/romanNumerals/.gitlab-ci.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-package-roman-numerals:
- variables:
- PROJECT_FOLDER: "romanNumerals"
- extends: .java
diff --git a/string-calculator/.gitlab-ci.yml b/string-calculator/.gitlab-ci.yml
new file mode 100644
index 00000000..e8b3c2c6
--- /dev/null
+++ b/string-calculator/.gitlab-ci.yml
@@ -0,0 +1,12 @@
+package-string-calculator:
+ variables:
+ PROJECT_FOLDER: "string-calculator"
+ extends: .java
+ only:
+ refs:
+ - master
+ - merge_requests
+ changes:
+ - ".gitlab-ci.yml"
+ - ".gitlab-common-ci.yml"
+ - "string-calculator/**/*"
diff --git a/stringCalculator/README.md b/string-calculator/README.md
similarity index 100%
rename from stringCalculator/README.md
rename to string-calculator/README.md
diff --git a/stringCalculator/pom.xml b/string-calculator/pom.xml
similarity index 100%
rename from stringCalculator/pom.xml
rename to string-calculator/pom.xml
diff --git a/stringCalculator/src/main/java/fr/ippon/stringcalculator/Calculator.java b/string-calculator/src/main/java/fr/ippon/stringcalculator/Calculator.java
similarity index 100%
rename from stringCalculator/src/main/java/fr/ippon/stringcalculator/Calculator.java
rename to string-calculator/src/main/java/fr/ippon/stringcalculator/Calculator.java
diff --git a/stringCalculator/src/test/java/fr/ippon/stringcalculator/CalculatorTest.java b/string-calculator/src/test/java/fr/ippon/stringcalculator/CalculatorTest.java
similarity index 100%
rename from stringCalculator/src/test/java/fr/ippon/stringcalculator/CalculatorTest.java
rename to string-calculator/src/test/java/fr/ippon/stringcalculator/CalculatorTest.java
diff --git a/stringCalculator/.gitlab-ci.yml b/stringCalculator/.gitlab-ci.yml
deleted file mode 100644
index da18480e..00000000
--- a/stringCalculator/.gitlab-ci.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-package-string-calculator:
- variables:
- PROJECT_FOLDER: "stringCalculator"
- extends: .java
diff --git a/word-wrap/.gitlab-ci.yml b/word-wrap/.gitlab-ci.yml
new file mode 100644
index 00000000..49d8a40b
--- /dev/null
+++ b/word-wrap/.gitlab-ci.yml
@@ -0,0 +1,12 @@
+package-word-wrap:
+ variables:
+ PROJECT_FOLDER: "word-wrap"
+ extends: .java
+ only:
+ refs:
+ - master
+ - merge_requests
+ changes:
+ - ".gitlab-ci.yml"
+ - ".gitlab-common-ci.yml"
+ - "word-wrap/**/*"
diff --git a/wordWrap/README.md b/word-wrap/README.md
similarity index 100%
rename from wordWrap/README.md
rename to word-wrap/README.md
diff --git a/wordWrap/pom.xml b/word-wrap/pom.xml
similarity index 100%
rename from wordWrap/pom.xml
rename to word-wrap/pom.xml
diff --git a/wordWrap/src/main/java/fr/ippon/kata/wrapper/Wrapper.java b/word-wrap/src/main/java/fr/ippon/kata/wrapper/Wrapper.java
similarity index 100%
rename from wordWrap/src/main/java/fr/ippon/kata/wrapper/Wrapper.java
rename to word-wrap/src/main/java/fr/ippon/kata/wrapper/Wrapper.java
diff --git a/wordWrap/src/test/java/fr/ippon/kata/wrapper/WrapperTest.java b/word-wrap/src/test/java/fr/ippon/kata/wrapper/WrapperTest.java
similarity index 100%
rename from wordWrap/src/test/java/fr/ippon/kata/wrapper/WrapperTest.java
rename to word-wrap/src/test/java/fr/ippon/kata/wrapper/WrapperTest.java
diff --git a/wordWrap/.gitlab-ci.yml b/wordWrap/.gitlab-ci.yml
deleted file mode 100644
index fb6a6835..00000000
--- a/wordWrap/.gitlab-ci.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-package-word-wrap:
- variables:
- PROJECT_FOLDER: "wordWrap"
- extends: .java
--
GitLab