From aa324dd8a0edda76690b2bd7e4310ad21981d808 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juan=20G=C3=B3mez=20Rey?= Date: Wed, 8 Apr 2026 10:27:54 +0200 Subject: [PATCH 01/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 f85d0cd..75e2287 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 26705c0f2d9afd0b6e9db1672f5ae1f91ab61e6b Mon Sep 17 00:00:00 2001 From: Juangomezzr Date: Thu, 9 Apr 2026 13:14:59 +0200 Subject: [PATCH 02/12] commit --- 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 6ba97d32732d8750a14a01e573bc04483262a500 Mon Sep 17 00:00:00 2001 From: Juangomezzr Date: Thu, 9 Apr 2026 13:20:16 +0200 Subject: [PATCH 03/12] sum --- 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 aad5a65a7281b75ee71d7379fdc8df75f105b16e Mon Sep 17 00:00:00 2001 From: Juangomezzr Date: Thu, 9 Apr 2026 13:54:12 +0200 Subject: [PATCH 04/12] workflow --- .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 75e2287..af66f1d 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 + runs-on: ${{matrix.os}} + strategy: + fail-fast: false + matrix: + os: [macos-latest, ubuntu-latest, windows-latest] + java: ['11', '17', '21'] + name: Java ${{matrix.java}} sample ${{matrix.os}} 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 2b4e682bc2cc21645b47bd7d020515cec360087b Mon Sep 17 00:00:00 2001 From: Juangomezzr Date: Thu, 9 Apr 2026 14:32:26 +0200 Subject: [PATCH 05/12] workflow --- .github/workflows/basic-workflow.yml | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/.github/workflows/basic-workflow.yml b/.github/workflows/basic-workflow.yml index af66f1d..05448a2 100644 --- a/.github/workflows/basic-workflow.yml +++ b/.github/workflows/basic-workflow.yml @@ -6,18 +6,28 @@ on: jobs: test: + runs-on: ${{matrix.os}} strategy: fail-fast: false matrix: os: [macos-latest, ubuntu-latest, windows-latest] - java: ['11', '17', '21'] + java: ['21'] name: Java ${{matrix.java}} sample ${{matrix.os}} steps: - uses: actions/checkout@v6 - - name: Set up JDK ${{matrix.java}} + - name: Set up JDK ${{ matrix.java }} uses: actions/setup-java@v5 with: distribution: 'temurin' - java-version: ${{matrix.java}} + java-version: ${{ matrix.java }} - run: mvn test + publish: + runs-on: ubuntu-latest + steps: + - name: Generate Docker image + run: mvn spring-boot:build-image -DskipTests -Dspring-boot.build-image.imageName=${{ secrets.DOCKERHUB_USERNAME }}/posts:v1 + - name: Login to DockerHub + run: docker login -u "${{ secrets.DOCKERHUB_USERNAME }}" -p "${{ secrets.DOCKERHUB_TOKEN }}" + - name: Push image to DockerHub + run: docker push ${{ secrets.DOCKERHUB_USERNAME }}/post \ No newline at end of file From fa597a8e4b523826c5012c8ff85287d9eeceb2f2 Mon Sep 17 00:00:00 2001 From: Juangomezzr Date: Thu, 9 Apr 2026 14:34:54 +0200 Subject: [PATCH 06/12] workflow --- .github/workflows/basic-workflow.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.github/workflows/basic-workflow.yml b/.github/workflows/basic-workflow.yml index 05448a2..e1fa6d0 100644 --- a/.github/workflows/basic-workflow.yml +++ b/.github/workflows/basic-workflow.yml @@ -25,6 +25,13 @@ jobs: publish: runs-on: ubuntu-latest steps: + - uses: actions/checkout@v4 + - name: Set up JDK 21 + uses: actions/setup-java@v4 + with: + distribution: 'temurin' + java-version: '21' + - name: Generate Docker image run: mvn spring-boot:build-image -DskipTests -Dspring-boot.build-image.imageName=${{ secrets.DOCKERHUB_USERNAME }}/posts:v1 - name: Login to DockerHub From 5d9d4d93291a6c292546d4dab2944d1d2318f2cc Mon Sep 17 00:00:00 2001 From: Juangomezzr Date: Wed, 15 Apr 2026 09:10:15 +0200 Subject: [PATCH 07/12] workflow --- .github/workflows/basic-workflow.yml | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/.github/workflows/basic-workflow.yml b/.github/workflows/basic-workflow.yml index e1fa6d0..fe6c278 100644 --- a/.github/workflows/basic-workflow.yml +++ b/.github/workflows/basic-workflow.yml @@ -4,24 +4,6 @@ on: workflow_dispatch: jobs: - - test: - - runs-on: ${{matrix.os}} - strategy: - fail-fast: false - matrix: - os: [macos-latest, ubuntu-latest, windows-latest] - java: ['21'] - name: Java ${{matrix.java}} sample ${{matrix.os}} - steps: - - uses: actions/checkout@v6 - - name: Set up JDK ${{ matrix.java }} - uses: actions/setup-java@v5 - with: - distribution: 'temurin' - java-version: ${{ matrix.java }} - - run: mvn test publish: runs-on: ubuntu-latest steps: From 80c10a7d1b79f2099ed6656c10b6d6e15a2ce8fa Mon Sep 17 00:00:00 2001 From: Juangomezzr Date: Wed, 15 Apr 2026 09:16:39 +0200 Subject: [PATCH 08/12] workflow --- .github/workflows/basic-workflow.yml | 9 ++++++++- pom.xml | 4 ++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.github/workflows/basic-workflow.yml b/.github/workflows/basic-workflow.yml index fe6c278..c0597fe 100644 --- a/.github/workflows/basic-workflow.yml +++ b/.github/workflows/basic-workflow.yml @@ -8,15 +8,22 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 + - name: Set up JDK 21 uses: actions/setup-java@v4 with: distribution: 'temurin' java-version: '21' + cache: 'maven' # Opcional: Acelera las builds futuras cacheando las dependencias - name: Generate Docker image + # Si tu pom.xml está en una subcarpeta (ej. /backend), descomenta la siguiente línea: + # working-directory: ./ruta-a-tu-carpeta run: mvn spring-boot:build-image -DskipTests -Dspring-boot.build-image.imageName=${{ secrets.DOCKERHUB_USERNAME }}/posts:v1 + - name: Login to DockerHub run: docker login -u "${{ secrets.DOCKERHUB_USERNAME }}" -p "${{ secrets.DOCKERHUB_TOKEN }}" + - name: Push image to DockerHub - run: docker push ${{ secrets.DOCKERHUB_USERNAME }}/post \ No newline at end of file + # Corregido: Debe coincidir exactamente con el imageName del paso de Maven + run: docker push ${{ secrets.DOCKERHUB_USERNAME }}/posts:v1 \ No newline at end of file diff --git a/pom.xml b/pom.xml index 59ad902..2b76e28 100755 --- a/pom.xml +++ b/pom.xml @@ -48,6 +48,10 @@ maven-surefire-plugin 3.5.2 + + org.springframework.boot + spring-boot-maven-plugin + From 6d1bde72a8e210e6ecc39e54a976049b1c9b198c Mon Sep 17 00:00:00 2001 From: Juangomezzr Date: Wed, 15 Apr 2026 09:20:58 +0200 Subject: [PATCH 09/12] change --- pom.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pom.xml b/pom.xml index 2b76e28..30964b3 100755 --- a/pom.xml +++ b/pom.xml @@ -51,6 +51,10 @@ org.springframework.boot spring-boot-maven-plugin + + + es.codeurjc.test.ejem.Calculadora + From 55998dd6afb5f51c1791eb3c408b8a3a1d5f6d3f Mon Sep 17 00:00:00 2001 From: Juangomezzr Date: Wed, 15 Apr 2026 09:29:57 +0200 Subject: [PATCH 10/12] changes --- .github/workflows/basic-workflow.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/basic-workflow.yml b/.github/workflows/basic-workflow.yml index c0597fe..c92fb91 100644 --- a/.github/workflows/basic-workflow.yml +++ b/.github/workflows/basic-workflow.yml @@ -16,10 +16,13 @@ jobs: java-version: '21' cache: 'maven' # Opcional: Acelera las builds futuras cacheando las dependencias + - name: Generate tag + run: echo "tag=$(mvn -q help:evaluate -Dexpression=project.version -DforceStdout)" > $GITHUB_OUTPUT + id: project - name: Generate Docker image # Si tu pom.xml está en una subcarpeta (ej. /backend), descomenta la siguiente línea: # working-directory: ./ruta-a-tu-carpeta - run: mvn spring-boot:build-image -DskipTests -Dspring-boot.build-image.imageName=${{ secrets.DOCKERHUB_USERNAME }}/posts:v1 + run: mvn spring-boot:build-image -DskipTests -Dspring-boot.build-image.imageName=${{ secrets.DOCKERHUB_USERNAME }}/posts:${{steps.project.outputs.tag}} - name: Login to DockerHub run: docker login -u "${{ secrets.DOCKERHUB_USERNAME }}" -p "${{ secrets.DOCKERHUB_TOKEN }}" From c4a8f962cb27769878f264f41e1471faa776c07b Mon Sep 17 00:00:00 2001 From: Juangomezzr Date: Wed, 15 Apr 2026 09:33:27 +0200 Subject: [PATCH 11/12] 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 c92fb91..f4bde2f 100644 --- a/.github/workflows/basic-workflow.yml +++ b/.github/workflows/basic-workflow.yml @@ -29,4 +29,4 @@ jobs: - name: Push image to DockerHub # Corregido: Debe coincidir exactamente con el imageName del paso de Maven - run: docker push ${{ secrets.DOCKERHUB_USERNAME }}/posts:v1 \ No newline at end of file + run: docker push ${{ secrets.DOCKERHUB_USERNAME }}/posts:${{steps.project.outputs.tag}} \ No newline at end of file From 1c320de63e3c86a39570ef24b11bfe995c10e8c8 Mon Sep 17 00:00:00 2001 From: Juangomezzr Date: Wed, 15 Apr 2026 09:35:36 +0200 Subject: [PATCH 12/12] version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 30964b3..d8ee872 100755 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ es.codeurjc.test calculadora - 0.0.1-SNAPSHOT + 1.0.0- jar