From b5302c08a4d395882b78539c0d4c1052fc304141 Mon Sep 17 00:00:00 2001 From: elouali Date: Mon, 2 Dec 2024 16:59:36 +0100 Subject: [PATCH 01/10] Add CI configuration --- .github/workflows/maven.yml | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 .github/workflows/maven.yml diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml new file mode 100644 index 0000000..83e2877 --- /dev/null +++ b/.github/workflows/maven.yml @@ -0,0 +1,23 @@ +name: Java CI + +on: [push, pull_request] + +jobs: + build: + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v2 + + - name: Set up JDK 11 + uses: actions/setup-java@v2 + with: + java-version: '11' + distribution: 'adopt' + + - name: Build and test + env: + DB_URL: jdbc:mysql://srv-bdens.insa-toulouse.fr:3306/projet_gei_023 + DB_USER: projet_gei_023 + DB_PASSWORD: ohQu4ood + run: mvn clean verify \ No newline at end of file From bd4aa6ddbe816d5b7d2d3a578fb236347d407620 Mon Sep 17 00:00:00 2001 From: elouali Date: Mon, 2 Dec 2024 17:04:05 +0100 Subject: [PATCH 02/10] Test CI: modif test --- src/main/java/database/DatabaseConnection.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/java/database/DatabaseConnection.java b/src/main/java/database/DatabaseConnection.java index 7f938a4..b99c6f8 100644 --- a/src/main/java/database/DatabaseConnection.java +++ b/src/main/java/database/DatabaseConnection.java @@ -24,4 +24,6 @@ public class DatabaseConnection { public static String getPassword() { return PASSWORD; } + + //modif test CI } From 552fb853bc2b51c8f8679798c4b5d47d3030a762 Mon Sep 17 00:00:00 2001 From: elouali Date: Mon, 2 Dec 2024 17:05:42 +0100 Subject: [PATCH 03/10] also CI test --- .forgejo/workflows/maven.yml | 21 --------------------- 1 file changed, 21 deletions(-) delete mode 100644 .forgejo/workflows/maven.yml diff --git a/.forgejo/workflows/maven.yml b/.forgejo/workflows/maven.yml deleted file mode 100644 index d1ff92a..0000000 --- a/.forgejo/workflows/maven.yml +++ /dev/null @@ -1,21 +0,0 @@ -image: maven:3.8.3-openjdk-17 - -services: - - mysql:8.0 - -variables: - MYSQL_DATABASE: projet_gei_023 - MYSQL_ROOT_PASSWORD: root - MYSQL_USER: user - MYSQL_PASSWORD: ohQu4ood - MYSQL_HOST: mysql - -stages: - - test - -test: - stage: test - script: - - mvn test - only: - - master \ No newline at end of file From e3d06bae75bf1e4817226fa39655c411bfcc3262 Mon Sep 17 00:00:00 2001 From: el-ouali Date: Mon, 2 Dec 2024 17:09:25 +0100 Subject: [PATCH 04/10] Actualiser .github/workflows/maven.yml --- .github/workflows/maven.yml | 36 ++++++++++++++++-------------------- 1 file changed, 16 insertions(+), 20 deletions(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 83e2877..f91c8e9 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -1,23 +1,19 @@ -name: Java CI +image: maven:3.8.3-openjdk-11 -on: [push, pull_request] +stages: + - build + - test -jobs: - build: - runs-on: ubuntu-latest +build: + stage: build + script: + - mvn compile - steps: - - uses: actions/checkout@v2 - - - name: Set up JDK 11 - uses: actions/setup-java@v2 - with: - java-version: '11' - distribution: 'adopt' - - - name: Build and test - env: - DB_URL: jdbc:mysql://srv-bdens.insa-toulouse.fr:3306/projet_gei_023 - DB_USER: projet_gei_023 - DB_PASSWORD: ohQu4ood - run: mvn clean verify \ No newline at end of file +test: + stage: test + script: + - mvn test + variables: + DB_URL: "jdbc:mysql://srv-bdens.insa-toulouse.fr:3306/projet_gei_023" + DB_USER: "projet_gei_023" + DB_PASSWORD: "ohQu4ood" \ No newline at end of file From 9770d72e8e094730fb6607dac7bcae282cb15b02 Mon Sep 17 00:00:00 2001 From: elouali Date: Mon, 2 Dec 2024 17:10:22 +0100 Subject: [PATCH 05/10] test ci 2 --- src/main/java/database/DatabaseConnection.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/database/DatabaseConnection.java b/src/main/java/database/DatabaseConnection.java index b99c6f8..dfec59b 100644 --- a/src/main/java/database/DatabaseConnection.java +++ b/src/main/java/database/DatabaseConnection.java @@ -25,5 +25,5 @@ public class DatabaseConnection { return PASSWORD; } - //modif test CI + //modif test 2 CI } From e0cbc5f49dc321a87ca71f31e960d840e5eaca3e Mon Sep 17 00:00:00 2001 From: el-ouali Date: Mon, 2 Dec 2024 17:13:30 +0100 Subject: [PATCH 06/10] Actualiser .github/workflows/maven.yml --- .github/workflows/maven.yml | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index f91c8e9..1d08731 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -1,19 +1,15 @@ -image: maven:3.8.3-openjdk-11 - -stages: - - build - - test - -build: - stage: build - script: - - mvn compile +workflow: + rules: + - if: $CI_COMMIT_BRANCH test: - stage: test + image: maven:3.8.3-openjdk-11 script: - - mvn test + - mvn clean test variables: DB_URL: "jdbc:mysql://srv-bdens.insa-toulouse.fr:3306/projet_gei_023" DB_USER: "projet_gei_023" - DB_PASSWORD: "ohQu4ood" \ No newline at end of file + DB_PASSWORD: "ohQu4ood" + artifacts: + reports: + junit: target/surefire-reports/*.xml \ No newline at end of file From 168941c6a0e8d10ebf62244ca1419837d5e5a62d Mon Sep 17 00:00:00 2001 From: elouali Date: Mon, 2 Dec 2024 17:14:01 +0100 Subject: [PATCH 07/10] test3 ci --- src/main/java/database/DatabaseConnection.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/database/DatabaseConnection.java b/src/main/java/database/DatabaseConnection.java index dfec59b..18fcebe 100644 --- a/src/main/java/database/DatabaseConnection.java +++ b/src/main/java/database/DatabaseConnection.java @@ -25,5 +25,5 @@ public class DatabaseConnection { return PASSWORD; } - //modif test 2 CI + //modif test 1/2/3 CI } From 1426626d1523b1915293431329d09c368be67d3d Mon Sep 17 00:00:00 2001 From: elouali Date: Mon, 2 Dec 2024 17:17:09 +0100 Subject: [PATCH 08/10] Rename CI config file --- .github/workflows/.gitlab-ci.yml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 .github/workflows/.gitlab-ci.yml diff --git a/.github/workflows/.gitlab-ci.yml b/.github/workflows/.gitlab-ci.yml new file mode 100644 index 0000000..1d08731 --- /dev/null +++ b/.github/workflows/.gitlab-ci.yml @@ -0,0 +1,15 @@ +workflow: + rules: + - if: $CI_COMMIT_BRANCH + +test: + image: maven:3.8.3-openjdk-11 + script: + - mvn clean test + variables: + DB_URL: "jdbc:mysql://srv-bdens.insa-toulouse.fr:3306/projet_gei_023" + DB_USER: "projet_gei_023" + DB_PASSWORD: "ohQu4ood" + artifacts: + reports: + junit: target/surefire-reports/*.xml \ No newline at end of file From 297765128973aba7422565cf169f1220a33af87e Mon Sep 17 00:00:00 2001 From: elouali Date: Mon, 2 Dec 2024 17:21:03 +0100 Subject: [PATCH 10/10] Add basic CI --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) create mode 100644 .gitlab-ci.yml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 0000000..1956dfa --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1 @@ +image: maven:3.8.3-openjdk-11 test: script: - mvn clean test variables: DB_URL: "jdbc:mysql://srv-bdens.insa-toulouse.fr:3306/projet_gei_023" DB_USER: "projet_gei_023" DB_PASSWORD: "ohQu4ood" \ No newline at end of file