From 54f84700dbd8e5adc5161fcfb7951c31614bdd1e Mon Sep 17 00:00:00 2001
From: rachidassouani <rachidassouani@gmail.com>
Date: Sat, 22 Jul 2023 16:23:04 +0100
Subject: [PATCH] updated yml file

---
 .github/workflows/backend-ci.yml              | 44 +++++++------------
 .../FullStackJavaApplication.java             |  2 +-
 2 files changed, 18 insertions(+), 28 deletions(-)

diff --git a/.github/workflows/backend-ci.yml b/.github/workflows/backend-ci.yml
index 7653ba7..eba9537 100644
--- a/.github/workflows/backend-ci.yml
+++ b/.github/workflows/backend-ci.yml
@@ -6,40 +6,30 @@ on:
     paths:
       - backend/**
 
+env:
+  POSTGRES_USER: rachid
+  POSTGRES_PASSWORD: password
+  POSTGRES_DB: fullstackjava
+  JAVA_VERSION: 17
+
 jobs:
   build:
     runs-on: ubuntu-latest
     services:
       postgres:
-        image: postgres:latest
+        image: postgres:15.3
         env:
-          POSTGRES_USER: rachid
-          POSTGRES_PASSWORD: password
-          POSTGRES_DB: fullstackjava
+          POSTGRES_DB: ${{ env.POSTGRESQL_DB }}
+          POSTGRES_USER: ${{ env.POSTGRESQL_USER }}
+          POSTGRES_PASSWORD: ${{ env.POSTGRESQL_PASSWORD }}
         ports:
           - 5432:5432
-        options: >-
-          --health-cmd pg_isready 
-          --health-timeout 5s 
-          --health-retries 5
-    defaults:
-      run:
-        working-directory: /backend
+        options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
     steps:
-      - name: Wait for PostgreSQL to start
-        run: |
-          until pg_isready -h localhost -p 5432; do
-            sleep 2;
-          done
-      - name: Create database and initialize schema
-        run: |
-          psql -h localhost -U ${{ env.POSTGRES_USER }} -d ${{ env.POSTGRES_PASSWORD }} -c "CREATE DATABASE fullstackjava;"
-
-      - uses: actions/checkout@v3
-      - uses: actions/setup-java@v3
+      - uses: actions/checkout@v2
+      - uses: actions/setup-java@v1.4.3
         with:
-          distribution: 'temurin'
-          java-version: '17'
-          cache: 'maven'
-      - name: Build and run Unit/Integration Tests with Maven
-        run: mvn -ntp -B verify
\ No newline at end of file
+          java-version: ${{ env.JAVA_VERSION }}
+      - name: Maven Clean Package
+        run: |
+          ./mvnw --no-transfer-progress clean package -P build-frontend
diff --git a/backend/src/main/java/io/rachidassouani/fullstackjava/FullStackJavaApplication.java b/backend/src/main/java/io/rachidassouani/fullstackjava/FullStackJavaApplication.java
index ebe7443..acdfc57 100644
--- a/backend/src/main/java/io/rachidassouani/fullstackjava/FullStackJavaApplication.java
+++ b/backend/src/main/java/io/rachidassouani/fullstackjava/FullStackJavaApplication.java
@@ -14,7 +14,7 @@ public class FullStackJavaApplication {
 	public static void main(String[] args) {
 		SpringApplication.run(FullStackJavaApplication.class, args);
 	}
-	
+
 	@Bean
 	CommandLineRunner commandLineRunner(CustomerRepository customerRepository) {
 		return args -> {