From 96a38acf09ca7aa803e27c097344b7a3c994c2a9 Mon Sep 17 00:00:00 2001 From: IciarML Date: Wed, 15 Apr 2026 10:20:31 +0200 Subject: [PATCH 1/5] Paso 1 - Desencadenador --- .github/workflows/basic-workflow.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/basic-workflow.yml b/.github/workflows/basic-workflow.yml index f85d0cd..92127bb 100644 --- a/.github/workflows/basic-workflow.yml +++ b/.github/workflows/basic-workflow.yml @@ -1,7 +1,9 @@ name: Continuous integration example -on: - push: +# ICÍAR +on: + pull_request: + branches: [ main ] jobs: From a0eea9ef503134eecfd028f00645da21e8929e65 Mon Sep 17 00:00:00 2001 From: IciarML Date: Wed, 15 Apr 2026 10:25:33 +0200 Subject: [PATCH 2/5] Paso 2 - Desencadenador --- .github/workflows/basic-workflow.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/basic-workflow.yml b/.github/workflows/basic-workflow.yml index 92127bb..8a09974 100644 --- a/.github/workflows/basic-workflow.yml +++ b/.github/workflows/basic-workflow.yml @@ -1,10 +1,12 @@ name: Continuous integration example + # ICÍAR on: pull_request: branches: [ main ] + jobs: test: From 13a9ab343c9ccd8e4abe006fdf45c50d9bd8a476 Mon Sep 17 00:00:00 2001 From: IciarML Date: Wed, 15 Apr 2026 10:25:52 +0200 Subject: [PATCH 3/5] Paso 1 - Desencadenador --- .github/workflows/basic-workflow.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/basic-workflow.yml b/.github/workflows/basic-workflow.yml index 8a09974..92127bb 100644 --- a/.github/workflows/basic-workflow.yml +++ b/.github/workflows/basic-workflow.yml @@ -1,12 +1,10 @@ name: Continuous integration example - # ICÍAR on: pull_request: branches: [ main ] - jobs: test: From c04a778296d429143e400166ec3164c6abeab55f Mon Sep 17 00:00:00 2001 From: IciarML Date: Wed, 15 Apr 2026 10:32:31 +0200 Subject: [PATCH 4/5] Paso 2 - Calculadora --- .../java/es/codeurjc/test/ejem/Calculadora.java | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/main/java/es/codeurjc/test/ejem/Calculadora.java b/src/main/java/es/codeurjc/test/ejem/Calculadora.java index cee74b0..541527b 100644 --- a/src/main/java/es/codeurjc/test/ejem/Calculadora.java +++ b/src/main/java/es/codeurjc/test/ejem/Calculadora.java @@ -2,11 +2,12 @@ public class Calculadora { - public double suma(double op1, double op2) { - return op1 + op2; - } + public double suma(double op1, double op2) { + return op1 * op2; + } + + public double resta(double op1, double op2) { + return op1 - op2; + } - public double resta(double op1, double op2) { - return op1 - op2; - } } From b13a749c73f26881555c95c4d0a9ae1352464ad3 Mon Sep 17 00:00:00 2001 From: IciarML Date: Wed, 15 Apr 2026 10:44:39 +0200 Subject: [PATCH 5/5] Paso 3 - Calculadora arreglada --- 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 541527b..2efe355 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) {