From 11649e62de63b7cb6268e4b82ab3c4d4d6018faa Mon Sep 17 00:00:00 2001 From: JPM1919 <153214837+JPM1919@users.noreply.github.com> Date: Thu, 3 Apr 2025 13:24:43 +0200 Subject: [PATCH 01/12] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index a0fa09a..34ea9b0 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,3 @@ # Ejemplo de Integración Continua con GitHub Actions -Este proyecto ofrece una Calculadora hecha en Java +Este proyecto ofrece una Calculadora hecha en Java, que bien From bffb2286f11cfefabefc577787f98bdb65fa3e15 Mon Sep 17 00:00:00 2001 From: JPM1919 <153214837+JPM1919@users.noreply.github.com> Date: Thu, 3 Apr 2025 13:49:04 +0200 Subject: [PATCH 02/12] 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 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 878aebbfd10b87db76029b26245e4f47e064fc15 Mon Sep 17 00:00:00 2001 From: JPM1919 <153214837+JPM1919@users.noreply.github.com> Date: Thu, 3 Apr 2025 13:50:45 +0200 Subject: [PATCH 03/12] error --- 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 e923107d92fe7fe538a5813eef4dccd2c772befd Mon Sep 17 00:00:00 2001 From: JPM1919 <153214837+JPM1919@users.noreply.github.com> Date: Thu, 3 Apr 2025 13:52:00 +0200 Subject: [PATCH 04/12] arreglado --- 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 9db6b6191c4dcb6872a7231724fdc8ac94e02752 Mon Sep 17 00:00:00 2001 From: JPM1919 <153214837+JPM1919@users.noreply.github.com> Date: Thu, 3 Apr 2025 13:53:27 +0200 Subject: [PATCH 05/12] arreglado2 --- .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 97b3dee6ac16f5397285f7c3d1aa023edbb563eb Mon Sep 17 00:00:00 2001 From: JPM1919 <153214837+JPM1919@users.noreply.github.com> Date: Thu, 3 Apr 2025 13:56:26 +0200 Subject: [PATCH 06/12] 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 33e0c46..04785de 100644 --- a/.github/workflows/basic-workflow.yml +++ b/.github/workflows/basic-workflow.yml @@ -1,7 +1,7 @@ name: Continuous integration example on: - pull_request: + push: jobs: From 9f6c5a8fe0ac25cf41257e3d8912fb9532745db6 Mon Sep 17 00:00:00 2001 From: JPM1919 <153214837+JPM1919@users.noreply.github.com> Date: Thu, 3 Apr 2025 13:58:42 +0200 Subject: [PATCH 07/12] arreglado3 --- .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 7db71b2ab54f078407e3432582e7bc9126c584aa Mon Sep 17 00:00:00 2001 From: JPM1919 <153214837+JPM1919@users.noreply.github.com> Date: Thu, 3 Apr 2025 14:06:40 +0200 Subject: [PATCH 08/12] error2 --- 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 482ed5f6ab8c2b2916cc1bb0ce8d31c904db630a Mon Sep 17 00:00:00 2001 From: JPM1919 <153214837+JPM1919@users.noreply.github.com> Date: Thu, 3 Apr 2025 14:11:31 +0200 Subject: [PATCH 09/12] arreglado5 --- 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 4466a2f174717464c4b296b5b3b653cd7c510829 Mon Sep 17 00:00:00 2001 From: JPM1919 <153214837+JPM1919@users.noreply.github.com> Date: Thu, 3 Apr 2025 14:20:20 +0200 Subject: [PATCH 10/12] hfnhr --- .github/workflows/basic-workflow.yml | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/.github/workflows/basic-workflow.yml b/.github/workflows/basic-workflow.yml index 33e0c46..9c37536 100644 --- a/.github/workflows/basic-workflow.yml +++ b/.github/workflows/basic-workflow.yml @@ -1,10 +1,17 @@ name: Continuous integration example on: - pull_request: + workflow_dispatch: jobs: - + build: + 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 test: runs-on: ubuntu-latest steps: @@ -13,5 +20,5 @@ jobs: uses: actions/setup-java@v4 with: distribution: 'temurin' - java-version: '21' + java-version: ${{ matrix.java }} - run: mvn test From c2086b1dd4d855c363cfe7291dfe6b8ad2a0f1aa Mon Sep 17 00:00:00 2001 From: JPM1919 <153214837+JPM1919@users.noreply.github.com> Date: Thu, 3 Apr 2025 14:25:28 +0200 Subject: [PATCH 11/12] gvyvi --- .github/workflows/basic-workflow.yml | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/.github/workflows/basic-workflow.yml b/.github/workflows/basic-workflow.yml index 9c37536..275017a 100644 --- a/.github/workflows/basic-workflow.yml +++ b/.github/workflows/basic-workflow.yml @@ -5,18 +5,17 @@ on: jobs: build: + test: runs-on: ${{ matrix.os }} strategy: - fail-fast: false - matrix: - os: [ macos-latest, windows-latest, ubuntu-latest ] - java: [ '11', '17', '21'] + fail-fast: false + matrix: + os: [ macos-latest, windows-latest, ubuntu-latest ] + java: [ '11', '17', '21'] name: Java ${{ matrix.java }} sample - test: - runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - name: Set up JDK 21 + - name: Set up JDK ${{ matrix.java }} uses: actions/setup-java@v4 with: distribution: 'temurin' From 0e906aa31c34cbd344cd8e235f6d57ad453d2faa Mon Sep 17 00:00:00 2001 From: JPM1919 <153214837+JPM1919@users.noreply.github.com> Date: Thu, 3 Apr 2025 14:25:50 +0200 Subject: [PATCH 12/12] kjbhvtcyt --- .github/workflows/basic-workflow.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/basic-workflow.yml b/.github/workflows/basic-workflow.yml index 275017a..1c478c8 100644 --- a/.github/workflows/basic-workflow.yml +++ b/.github/workflows/basic-workflow.yml @@ -4,7 +4,6 @@ on: workflow_dispatch: jobs: - build: test: runs-on: ${{ matrix.os }} strategy: