From 309de913a7fd5f7ff6884c4826a3addd5b60c0ca Mon Sep 17 00:00:00 2001 From: Markos9 Date: Tue, 22 Apr 2025 17:08:32 +0200 Subject: [PATCH 1/4] update + for * --- .github/workflows/basic-workflow.yml | 2 +- src/main/java/es/codeurjc/test/ejem/Calculadora.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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: 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 73b6e10260fe9369f2d74e4fce388d366a283fc1 Mon Sep 17 00:00:00 2001 From: Markos9 Date: Tue, 22 Apr 2025 17:13:04 +0200 Subject: [PATCH 2/4] fixed --- 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 a481f1b54678c5b013122122a8022dbb7bfac764 Mon Sep 17 00:00:00 2001 From: Markos9 Date: Tue, 22 Apr 2025 17:22:36 +0200 Subject: [PATCH 3/4] update worklow ej2 --- .github/workflows/basic-workflow.yml | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/.github/workflows/basic-workflow.yml b/.github/workflows/basic-workflow.yml index 33e0c46..a251bba 100644 --- a/.github/workflows/basic-workflow.yml +++ b/.github/workflows/basic-workflow.yml @@ -1,17 +1,24 @@ name: Continuous integration example on: - pull_request: + push: jobs: test: - runs-on: ubuntu-latest + 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@v4 - - name: Set up JDK 21 + - name: Set up JDK ${{ matrix.java }} uses: actions/setup-java@v4 with: - distribution: 'temurin' - java-version: '21' + distribution: 'adpot' + java-version: ${{ matrix.java }} - run: mvn test From d049baf613c04c7a6ab6189eea3251f9e458c5a6 Mon Sep 17 00:00:00 2001 From: Markos9 Date: Wed, 23 Apr 2025 10:16:45 +0200 Subject: [PATCH 4/4] fixed 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 a251bba..e5de6db 100644 --- a/.github/workflows/basic-workflow.yml +++ b/.github/workflows/basic-workflow.yml @@ -19,6 +19,6 @@ jobs: - name: Set up JDK ${{ matrix.java }} uses: actions/setup-java@v4 with: - distribution: 'adpot' + distribution: 'adopt' java-version: ${{ matrix.java }} - run: mvn test