From f0d8946ad05b0505d724b0e359b571d5361ef2ad Mon Sep 17 00:00:00 2001 From: ZairaURJC Date: Thu, 3 Apr 2025 13:26:32 +0200 Subject: [PATCH 01/10] Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index a0fa09a..a9dece4 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,4 @@ # Ejemplo de Integración Continua con GitHub Actions Este proyecto ofrece una Calculadora hecha en Java +Cambio From 6f858e35273bc12b543f22bb4de0a127947a6a1b Mon Sep 17 00:00:00 2001 From: ZairaURJC Date: Thu, 3 Apr 2025 13:27:22 +0200 Subject: [PATCH 02/10] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index a9dece4..0e22bcc 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ # Ejemplo de Integración Continua con GitHub Actions Este proyecto ofrece una Calculadora hecha en Java -Cambio +Cambio 2 From 12fee2c3ea8078707e4267ecb32a3b37e273a31a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zaira=20Ruiz=20Fern=C3=A1ndez?= Date: Thu, 3 Apr 2025 13:52:50 +0200 Subject: [PATCH 03/10] Change workflow --- .github/workflows/basic-workflow.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/basic-workflow.yml b/.github/workflows/basic-workflow.yml index 04785de..33e0c46 100644 --- a/.github/workflows/basic-workflow.yml +++ b/.github/workflows/basic-workflow.yml @@ -1,7 +1,7 @@ name: Continuous integration example on: - push: + pull_request: jobs: From 1a9bf8a3767f21d59c7392adb1643f3703aa2c81 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zaira=20Ruiz=20Fern=C3=A1ndez?= Date: Thu, 3 Apr 2025 13:55:00 +0200 Subject: [PATCH 04/10] change + to * --- 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 c7d46311f81dbb6edd728d6f6be48a2fa4d262b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zaira=20Ruiz=20Fern=C3=A1ndez?= Date: Thu, 3 Apr 2025 13:59:09 +0200 Subject: [PATCH 05/10] Change * to + --- 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 bffb714e614963095711115546287b6539217622 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zaira=20Ruiz=20Fern=C3=A1ndez?= Date: Thu, 3 Apr 2025 14:23:29 +0200 Subject: [PATCH 06/10] workflow change --- .github/workflows/basic-workflow.yml | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/.github/workflows/basic-workflow.yml b/.github/workflows/basic-workflow.yml index 33e0c46..12e3f07 100644 --- a/.github/workflows/basic-workflow.yml +++ b/.github/workflows/basic-workflow.yml @@ -1,17 +1,23 @@ name: Continuous integration example on: - pull_request: + workflow_dispatch: jobs: test: runs-on: ubuntu-latest + 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@v4 - - name: Set up JDK 21 + - name: Set up JDK ${{matrix.java}} uses: actions/setup-java@v4 with: distribution: 'temurin' - java-version: '21' + java-version: ${{matrix.java}} - run: mvn test From ac3e4b4f7e36d32502e1262aa0e631a60a8d5ada Mon Sep 17 00:00:00 2001 From: ZairaURJC Date: Thu, 3 Apr 2025 14:29:23 +0200 Subject: [PATCH 07/10] Update basic-workflow.yml --- .github/workflows/basic-workflow.yml | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/.github/workflows/basic-workflow.yml b/.github/workflows/basic-workflow.yml index 33e0c46..12e3f07 100644 --- a/.github/workflows/basic-workflow.yml +++ b/.github/workflows/basic-workflow.yml @@ -1,17 +1,23 @@ name: Continuous integration example on: - pull_request: + workflow_dispatch: jobs: test: runs-on: ubuntu-latest + 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@v4 - - name: Set up JDK 21 + - name: Set up JDK ${{matrix.java}} uses: actions/setup-java@v4 with: distribution: 'temurin' - java-version: '21' + java-version: ${{matrix.java}} - run: mvn test From d656e8dd8637c446b7873bf2773026bc20f027bc Mon Sep 17 00:00:00 2001 From: ZairaURJC Date: Thu, 3 Apr 2025 14:34:37 +0200 Subject: [PATCH 08/10] Update basic-workflow.yml --- .github/workflows/basic-workflow.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/basic-workflow.yml b/.github/workflows/basic-workflow.yml index 12e3f07..a589d4e 100644 --- a/.github/workflows/basic-workflow.yml +++ b/.github/workflows/basic-workflow.yml @@ -6,7 +6,7 @@ on: jobs: test: - runs-on: ubuntu-latest + runs-on: ${{matrix.os}} strategy: fail-fast: false matrix: From 7c8f7118ae8222b0512bb6239a06c2216fe64187 Mon Sep 17 00:00:00 2001 From: ZairaURJC Date: Thu, 3 Apr 2025 14:36:14 +0200 Subject: [PATCH 09/10] Update basic-workflow.yml --- .github/workflows/basic-workflow.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/basic-workflow.yml b/.github/workflows/basic-workflow.yml index a589d4e..7628611 100644 --- a/.github/workflows/basic-workflow.yml +++ b/.github/workflows/basic-workflow.yml @@ -6,12 +6,12 @@ on: jobs: test: - runs-on: ${{matrix.os}} strategy: fail-fast: false matrix: os: [macos-latest,windows-latest,ubuntu-latest] java: ['11','17','21'] + runs-on: ${{matrix.os}} name: Java ${{matrix.java}} sample steps: - uses: actions/checkout@v4 From 1ba688dc2b1a6c7ff26c9c686a8056ff7a87553c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zaira=20Ruiz=20Fern=C3=A1ndez?= Date: Thu, 10 Apr 2025 14:18:02 +0200 Subject: [PATCH 10/10] version change --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 105499c..58fe361 100755 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ es.codeurjc.test calculadora - 0.0.1-SNAPSHOT + 0.0.1 jar