From 0590e361411c080da5023fa93d7105e3227734f9 Mon Sep 17 00:00:00 2001 From: arturoovinuesaa Date: Wed, 15 Apr 2026 10:06:58 +0200 Subject: [PATCH 01/10] Update workflow trigger to use pull_request for main branch --- .github/workflows/basic-workflow.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/basic-workflow.yml b/.github/workflows/basic-workflow.yml index f85d0cd..fa502ba 100644 --- a/.github/workflows/basic-workflow.yml +++ b/.github/workflows/basic-workflow.yml @@ -1,7 +1,8 @@ name: Continuous integration example on: - push: + pull_request: + branches: [ main ] jobs: From fbf30c73a31851c0523728b641fd09d9d2814510 Mon Sep 17 00:00:00 2001 From: arturoovinuesaa Date: Wed, 15 Apr 2026 10:08:35 +0200 Subject: [PATCH 02/10] Fix suma method to perform multiplication instead of addition --- src/main/java/es/codeurjc/test/ejem/Calculadora.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/es/codeurjc/test/ejem/Calculadora.java b/src/main/java/es/codeurjc/test/ejem/Calculadora.java index cee74b0..3c76909 100644 --- a/src/main/java/es/codeurjc/test/ejem/Calculadora.java +++ b/src/main/java/es/codeurjc/test/ejem/Calculadora.java @@ -3,7 +3,7 @@ public class Calculadora { public double suma(double op1, double op2) { - return op1 + op2; + return op1 * op2; } public double resta(double op1, double op2) { From ef0b8d844470f27626b9541a600b5960c35803bd Mon Sep 17 00:00:00 2001 From: arturoovinuesaa Date: Wed, 15 Apr 2026 10:11:02 +0200 Subject: [PATCH 03/10] Rompe suma: cambia + por * --- src/main/java/es/codeurjc/test/ejem/Calculadora.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/es/codeurjc/test/ejem/Calculadora.java b/src/main/java/es/codeurjc/test/ejem/Calculadora.java index 3c76909..cee74b0 100644 --- a/src/main/java/es/codeurjc/test/ejem/Calculadora.java +++ b/src/main/java/es/codeurjc/test/ejem/Calculadora.java @@ -3,7 +3,7 @@ public class Calculadora { public double suma(double op1, double op2) { - return op1 * op2; + return op1 + op2; } public double resta(double op1, double op2) { From c4f516d07d043d4ece3613e734293cb0a19c69dc Mon Sep 17 00:00:00 2001 From: arturoovinuesaa Date: Wed, 15 Apr 2026 10:12:38 +0200 Subject: [PATCH 04/10] Rompe suma: cambia + por * --- src/main/java/es/codeurjc/test/ejem/Calculadora.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/es/codeurjc/test/ejem/Calculadora.java b/src/main/java/es/codeurjc/test/ejem/Calculadora.java index cee74b0..3c76909 100644 --- a/src/main/java/es/codeurjc/test/ejem/Calculadora.java +++ b/src/main/java/es/codeurjc/test/ejem/Calculadora.java @@ -3,7 +3,7 @@ public class Calculadora { public double suma(double op1, double op2) { - return op1 + op2; + return op1 * op2; } public double resta(double op1, double op2) { From da9960631739411da46365700362973cdc839231 Mon Sep 17 00:00:00 2001 From: arturoovinuesaa Date: Wed, 15 Apr 2026 10:21:28 +0200 Subject: [PATCH 05/10] Fix suma method to perform addition instead of multiplication --- src/main/java/es/codeurjc/test/ejem/Calculadora.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/es/codeurjc/test/ejem/Calculadora.java b/src/main/java/es/codeurjc/test/ejem/Calculadora.java index 3c76909..cee74b0 100644 --- a/src/main/java/es/codeurjc/test/ejem/Calculadora.java +++ b/src/main/java/es/codeurjc/test/ejem/Calculadora.java @@ -3,7 +3,7 @@ public class Calculadora { public double suma(double op1, double op2) { - return op1 * op2; + return op1 + op2; } public double resta(double op1, double op2) { From 78abe26e1dda43181e3bbe220557567b10270d7b Mon Sep 17 00:00:00 2001 From: arturoovinuesaa Date: Wed, 15 Apr 2026 10:23:36 +0200 Subject: [PATCH 06/10] Fix suma method to perform multiplication instead of addition --- src/main/java/es/codeurjc/test/ejem/Calculadora.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/es/codeurjc/test/ejem/Calculadora.java b/src/main/java/es/codeurjc/test/ejem/Calculadora.java index cee74b0..3c76909 100644 --- a/src/main/java/es/codeurjc/test/ejem/Calculadora.java +++ b/src/main/java/es/codeurjc/test/ejem/Calculadora.java @@ -3,7 +3,7 @@ public class Calculadora { public double suma(double op1, double op2) { - return op1 + op2; + return op1 * op2; } public double resta(double op1, double op2) { From 8775148e7e0b664244245a59147860fd90738a79 Mon Sep 17 00:00:00 2001 From: arturoovinuesaa Date: Wed, 15 Apr 2026 10:24:54 +0200 Subject: [PATCH 07/10] Fix suma method to perform addition instead of multiplication --- src/main/java/es/codeurjc/test/ejem/Calculadora.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/es/codeurjc/test/ejem/Calculadora.java b/src/main/java/es/codeurjc/test/ejem/Calculadora.java index 3c76909..cee74b0 100644 --- a/src/main/java/es/codeurjc/test/ejem/Calculadora.java +++ b/src/main/java/es/codeurjc/test/ejem/Calculadora.java @@ -3,7 +3,7 @@ public class Calculadora { public double suma(double op1, double op2) { - return op1 * op2; + return op1 + op2; } public double resta(double op1, double op2) { From 509262176ad8e74c94e694600d521c0e36f8f4aa Mon Sep 17 00:00:00 2001 From: arturoovinuesaa Date: Mon, 20 Apr 2026 13:48:50 +0200 Subject: [PATCH 08/10] Refactor CI workflow to support multiple OS and Java versions --- .github/workflows/basic-workflow.yml | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/.github/workflows/basic-workflow.yml b/.github/workflows/basic-workflow.yml index fa502ba..53d5957 100644 --- a/.github/workflows/basic-workflow.yml +++ b/.github/workflows/basic-workflow.yml @@ -7,12 +7,18 @@ on: jobs: test: - runs-on: ubuntu-latest - steps: + runs-on: ${{ matrix.os }} + strategy: + fail-fast: false + matrix: + os: [ macos-latest, windows-latest, ubuntu-latest ] + java: [ '11', '17', '21'] + name: Java ${{ matrix.java }} sample + steps: - uses: actions/checkout@v6 - - name: Set up JDK 21 + - name: Set up JDK ${{ matrix.java }} uses: actions/setup-java@v5 with: distribution: 'temurin' - java-version: '21' + java-version: ${{ matrix.java }} - run: mvn test From d4fdcf5cee55cff2a7c86771a9d6bffbe6a98fe0 Mon Sep 17 00:00:00 2001 From: arturoovinuesaa Date: Mon, 20 Apr 2026 13:50:29 +0200 Subject: [PATCH 09/10] Simplify CI workflow by removing matrix strategy and fixing JDK setup to use a single version --- .github/workflows/basic-workflow.yml | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/.github/workflows/basic-workflow.yml b/.github/workflows/basic-workflow.yml index 53d5957..fa502ba 100644 --- a/.github/workflows/basic-workflow.yml +++ b/.github/workflows/basic-workflow.yml @@ -7,18 +7,12 @@ on: jobs: test: - runs-on: ${{ matrix.os }} - strategy: - fail-fast: false - matrix: - os: [ macos-latest, windows-latest, ubuntu-latest ] - java: [ '11', '17', '21'] - name: Java ${{ matrix.java }} sample - steps: + runs-on: ubuntu-latest + steps: - uses: actions/checkout@v6 - - name: Set up JDK ${{ matrix.java }} + - name: Set up JDK 21 uses: actions/setup-java@v5 with: distribution: 'temurin' - java-version: ${{ matrix.java }} + java-version: '21' - run: mvn test From bb02a393b836027ca6013bed42620447a359f257 Mon Sep 17 00:00:00 2001 From: arturoovinuesaa Date: Mon, 20 Apr 2026 13:50:57 +0200 Subject: [PATCH 10/10] Refactor CI workflow to use a matrix strategy for multiple OS and Java versions --- .github/workflows/basic-workflow.yml | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/.github/workflows/basic-workflow.yml b/.github/workflows/basic-workflow.yml index fa502ba..03c6f46 100644 --- a/.github/workflows/basic-workflow.yml +++ b/.github/workflows/basic-workflow.yml @@ -1,18 +1,23 @@ name: Continuous integration example on: - pull_request: - branches: [ main ] + push: jobs: test: - runs-on: ubuntu-latest - steps: + runs-on: ${{ matrix.os }} + strategy: + fail-fast: false + matrix: + os: [ macos-latest, windows-latest, ubuntu-latest ] + java: [ '11', '17', '21'] + name: Java ${{ matrix.java }} sample + steps: - uses: actions/checkout@v6 - - name: Set up JDK 21 + - name: Set up JDK ${{ matrix.java }} uses: actions/setup-java@v5 with: distribution: 'temurin' - java-version: '21' + java-version: ${{ matrix.java }} - run: mvn test