From 5e82711bf2623c1e415327bbf95f6fe6069d6110 Mon Sep 17 00:00:00 2001 From: jperezsa2020 Date: Thu, 23 Jan 2025 11:05:51 +0100 Subject: [PATCH 01/10] Update main.yml --- .github/workflows/main.yml | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 93de2a8..153c1e4 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -3,7 +3,7 @@ name: Java CI with Maven on: workflow_dispatch: push: - + jobs: build: runs-on: ubuntu-latest @@ -15,7 +15,19 @@ jobs: with: java-version: '21' distribution: 'temurin' - cache: maven - - name: Build with Maven - working-directory: backend - run: mvn -B package --file pom.xml + + - name: Log in to Docker Hub + uses: docker/login-action@v2 + with: + username: ${{ secrets.DOCKER_USERNAME }} + password: ${{ secrets.DOCKER_PASSWORD }} + + - name: Build and push Docker image + run: | + tag=$(date +'%Y%m%d.%H%M%S') + docker build ${{ secrets.DOCKERHUB_USERNAME }}/java_app:$tag -f docker/Dockerfile . + docker push ${{ secrets.DOCKERHUB_USERNAME }}/java_app:$tag + + + + From a28bae41fe2f8cba69bc17026e95f596f84864d1 Mon Sep 17 00:00:00 2001 From: jperezsa2020 Date: Thu, 23 Jan 2025 11:09:48 +0100 Subject: [PATCH 02/10] Update main.yml --- .github/workflows/main.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 153c1e4..aec8029 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -24,9 +24,8 @@ jobs: - name: Build and push Docker image run: | - tag=$(date +'%Y%m%d.%H%M%S') - docker build ${{ secrets.DOCKERHUB_USERNAME }}/java_app:$tag -f docker/Dockerfile . - docker push ${{ secrets.DOCKERHUB_USERNAME }}/java_app:$tag + docker build -t ${{ secrets.DOCKERHUB_USERNAME }}/java_app:2.0 -f docker/Dockerfile . + docker push ${{ secrets.DOCKERHUB_USERNAME }}/java_app:2.0 From 4eb839f7e321120ae62033a935a1112473d5dfba Mon Sep 17 00:00:00 2001 From: jperezsa2020 Date: Thu, 23 Jan 2025 11:11:50 +0100 Subject: [PATCH 03/10] Update main.yml --- .github/workflows/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index aec8029..6b8ece8 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -24,8 +24,8 @@ jobs: - name: Build and push Docker image run: | - docker build -t ${{ secrets.DOCKERHUB_USERNAME }}/java_app:2.0 -f docker/Dockerfile . - docker push ${{ secrets.DOCKERHUB_USERNAME }}/java_app:2.0 + docker build -t ${{ secrets.DOCKER_USERNAME }}/java_app:2.0 -f docker/Dockerfile . + docker push ${{ secrets.DOCKER_USERNAME }}/java_app:2.0 From 3d5cbe75f7fef4d02bfef21dbfa43dc1bfb9cfe2 Mon Sep 17 00:00:00 2001 From: jperezsa2020 Date: Thu, 23 Jan 2025 11:33:01 +0100 Subject: [PATCH 04/10] Update main.yml --- .github/workflows/main.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 6b8ece8..68935a7 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -15,6 +15,16 @@ jobs: with: java-version: '21' distribution: 'temurin' + + - name: Build and Run Spring Boot Backend + run: | + cd backend + ./mvnw clean package -DskipTests + nohup java -jar target/*.jar & + + - name: Run Spring Boot tests + run: mvn test + working-directory: ./Backend - name: Log in to Docker Hub uses: docker/login-action@v2 From dc127a77cde6e17cf7ed35042b81f471ca3f6cbf Mon Sep 17 00:00:00 2001 From: jperezsa2020 Date: Thu, 23 Jan 2025 11:36:45 +0100 Subject: [PATCH 05/10] Update main.yml --- .github/workflows/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 68935a7..d2219f5 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -18,8 +18,8 @@ jobs: - name: Build and Run Spring Boot Backend run: | - cd backend - ./mvnw clean package -DskipTests + cd ./backend + mvn clean package -DskipTests nohup java -jar target/*.jar & - name: Run Spring Boot tests From 86cdcf96e7d716f8c00cd2bdb8e0f169267df8cf Mon Sep 17 00:00:00 2001 From: jperezsa2020 Date: Thu, 23 Jan 2025 11:39:00 +0100 Subject: [PATCH 06/10] Update main.yml --- .github/workflows/main.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index d2219f5..033252c 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -23,8 +23,9 @@ jobs: nohup java -jar target/*.jar & - name: Run Spring Boot tests - run: mvn test - working-directory: ./Backend + run: | + cd ./backend + mvn test - name: Log in to Docker Hub uses: docker/login-action@v2 From 3c197982b8f39bfa38eede3b4fba11f66a58cdbe Mon Sep 17 00:00:00 2001 From: jperezsa2020 Date: Thu, 23 Jan 2025 12:02:19 +0100 Subject: [PATCH 07/10] Update main.yml --- .github/workflows/main.yml | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 033252c..50d26a3 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -22,11 +22,24 @@ jobs: mvn clean package -DskipTests nohup java -jar target/*.jar & + - name: Set up Node.js + uses: actions/setup-node@v3 + with: + node-version: 20.17.0 + + # Build y ejecución del Frontend (sin tests) + - name: Build and Run Angular Frontend + run: | + cd ./frontend + npm install + run build --prod + nohup ng serve --proxy-config proxy.conf.json + - name: Run Spring Boot tests run: | cd ./backend mvn test - + - name: Log in to Docker Hub uses: docker/login-action@v2 with: @@ -36,8 +49,5 @@ jobs: - name: Build and push Docker image run: | docker build -t ${{ secrets.DOCKER_USERNAME }}/java_app:2.0 -f docker/Dockerfile . - docker push ${{ secrets.DOCKER_USERNAME }}/java_app:2.0 - - - + docker push ${{ secrets.DOCKER_USERNAME }}/java_app:2.0 From d7773f821b5c58ccf8ac1f44625dd840e10a3c82 Mon Sep 17 00:00:00 2001 From: jperezsa2020 Date: Thu, 23 Jan 2025 12:05:47 +0100 Subject: [PATCH 08/10] Update main.yml --- .github/workflows/main.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 50d26a3..35e20ac 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -31,8 +31,12 @@ jobs: - name: Build and Run Angular Frontend run: | cd ./frontend + npm ci + echo ok npm install + echo ok2 run build --prod + echo ok3 nohup ng serve --proxy-config proxy.conf.json - name: Run Spring Boot tests From e27752fd70ff5c2304ad947ee7a0122a22b0b9e9 Mon Sep 17 00:00:00 2001 From: jperezsa2020 Date: Thu, 23 Jan 2025 12:07:20 +0100 Subject: [PATCH 09/10] Update main.yml --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 35e20ac..d1d0592 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -35,7 +35,7 @@ jobs: echo ok npm install echo ok2 - run build --prod + npm run build --prod echo ok3 nohup ng serve --proxy-config proxy.conf.json From ffd87fa6480fb7d404da7bda4d64e6a57207de60 Mon Sep 17 00:00:00 2001 From: jperezsa2020 Date: Thu, 23 Jan 2025 12:09:15 +0100 Subject: [PATCH 10/10] Update main.yml --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index d1d0592..a37e9f6 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -37,7 +37,7 @@ jobs: echo ok2 npm run build --prod echo ok3 - nohup ng serve --proxy-config proxy.conf.json + nohup npx http-server ./dist/[frontend] -p 4200 & - name: Run Spring Boot tests run: |