From 898946089b8607c1a530f7f6f97a16c1ce432e3e Mon Sep 17 00:00:00 2001 From: Adrien Albuquerque Date: Mon, 17 Feb 2025 12:02:02 +0100 Subject: [PATCH 1/8] Update ci.yml --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d8152d0..35ea7a8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,4 +1,4 @@ -name: Continuous Integration +name: CI on: push: From 7e18b0a29ab1ed8d5072ba809622777b17b09f10 Mon Sep 17 00:00:00 2001 From: Adrien Albuquerque Date: Mon, 17 Feb 2025 12:03:03 +0100 Subject: [PATCH 2/8] Update ci.yml --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 35ea7a8..4ce2ba1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,4 +1,4 @@ -name: CI +name: Continuous Integration on: push: @@ -23,4 +23,4 @@ jobs: java-version: "17" - name: Build with Maven - run: mvn clean package + run: cd java && mvn clean package From 39b36ff16807bbfb6ff2c13f337c6e45a0b0d8f2 Mon Sep 17 00:00:00 2001 From: Adrien Albuquerque Date: Mon, 17 Feb 2025 12:05:15 +0100 Subject: [PATCH 3/8] Update ci.yml --- .github/workflows/ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4ce2ba1..2626b48 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -23,4 +23,5 @@ jobs: java-version: "17" - name: Build with Maven - run: cd java && mvn clean package + working-directory: java + run: mvn clean package From 4f87e0286c65180eed6c61440ae2bc8b8a7ae00b Mon Sep 17 00:00:00 2001 From: Adrien Albuquerque Date: Mon, 17 Feb 2025 12:09:24 +0100 Subject: [PATCH 4/8] Update ci.yml --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2626b48..c4d00de 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -24,4 +24,4 @@ jobs: - name: Build with Maven working-directory: java - run: mvn clean package + run: mvn clean package -f java/pom.xml From eeddc22897f4b117c22bf9a0a952728b33c217b0 Mon Sep 17 00:00:00 2001 From: Adrien Albuquerque Date: Mon, 17 Feb 2025 12:11:21 +0100 Subject: [PATCH 5/8] Update ci.yml --- .github/workflows/ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c4d00de..f53bc2d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -23,5 +23,4 @@ jobs: java-version: "17" - name: Build with Maven - working-directory: java run: mvn clean package -f java/pom.xml From 5573bc8e7fe9adc59b8e2bd05125ebb6000c5e43 Mon Sep 17 00:00:00 2001 From: Adrien Albuquerque Date: Mon, 17 Feb 2025 12:14:27 +0100 Subject: [PATCH 6/8] Update ci.yml --- .github/workflows/ci.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f53bc2d..23d07bb 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -16,11 +16,11 @@ jobs: - name: Checkout repository uses: actions/checkout@v3 - - name: Set up JDK 17 - uses: actions/setup-java@v3 - with: - distribution: temurin - java-version: "17" + - name: Build and start containers + run: docker-compose up -d - - name: Build with Maven - run: mvn clean package -f java/pom.xml + - name: Run Maven build inside container + run: docker-compose exec app mvn clean package -f /source/pom.xml -X + + - name: Stop containers + run: docker-compose down From cf7c61ba1d15c9456667a82a904d1c3f046403ce Mon Sep 17 00:00:00 2001 From: Adrien Albuquerque Date: Mon, 17 Feb 2025 12:15:46 +0100 Subject: [PATCH 7/8] Update ci.yml --- .github/workflows/ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 23d07bb..6f33357 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,10 +17,10 @@ jobs: uses: actions/checkout@v3 - name: Build and start containers - run: docker-compose up -d + run: docker compose up -d - name: Run Maven build inside container - run: docker-compose exec app mvn clean package -f /source/pom.xml -X + run: docker compose exec app mvn clean package -f /source/pom.xml -X - name: Stop containers - run: docker-compose down + run: docker compose down From 3ba43fc51195b01624f82a81e4054276069f5a4e Mon Sep 17 00:00:00 2001 From: Adrien Albuquerque Date: Mon, 17 Feb 2025 12:17:58 +0100 Subject: [PATCH 8/8] Update ci.yml --- .github/workflows/ci.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6f33357..89c3797 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,9 +1,6 @@ name: Continuous Integration on: - push: - branches-ignore: - - main pull_request: branches: - main @@ -16,6 +13,12 @@ jobs: - name: Checkout repository uses: actions/checkout@v3 + - name: Set up JDK 17 + uses: actions/setup-java@v3 + with: + distribution: temurin + java-version: "17" + - name: Build and start containers run: docker compose up -d