From 291c518da495e70622c828b952ac814756976730 Mon Sep 17 00:00:00 2001 From: danglotb Date: Thu, 17 Jun 2021 09:55:02 +0200 Subject: [PATCH 1/9] ci: enable github action --- .github/workflows/mvn-build-action.yml | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 .github/workflows/mvn-build-action.yml diff --git a/.github/workflows/mvn-build-action.yml b/.github/workflows/mvn-build-action.yml new file mode 100644 index 00000000..ee162d5e --- /dev/null +++ b/.github/workflows/mvn-build-action.yml @@ -0,0 +1,24 @@ +name: Java CI + +on: + push: + branches: + - master + pull_request: + branches: + - master + +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 with Maven + run: mvn --batch-mode --update-snapshots verify + From 92087e1b3133c1946345abb0fcbdcc543d4805c8 Mon Sep 17 00:00:00 2001 From: danglotb Date: Thu, 17 Jun 2021 09:57:10 +0200 Subject: [PATCH 2/9] ci: enable gh action on push --- .github/workflows/mvn-build-action.yml | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/.github/workflows/mvn-build-action.yml b/.github/workflows/mvn-build-action.yml index ee162d5e..1820d3b2 100644 --- a/.github/workflows/mvn-build-action.yml +++ b/.github/workflows/mvn-build-action.yml @@ -1,12 +1,6 @@ name: Java CI -on: - push: - branches: - - master - pull_request: - branches: - - master +on: [push] jobs: build: From b0c9736a20bbc656ed85156601b3c2d95614be4a Mon Sep 17 00:00:00 2001 From: danglotb Date: Thu, 17 Jun 2021 09:59:04 +0200 Subject: [PATCH 3/9] ci: use now Java 8 --- .github/workflows/mvn-build-action.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/mvn-build-action.yml b/.github/workflows/mvn-build-action.yml index 1820d3b2..6f92da90 100644 --- a/.github/workflows/mvn-build-action.yml +++ b/.github/workflows/mvn-build-action.yml @@ -8,10 +8,10 @@ jobs: steps: - uses: actions/checkout@v2 - - name: Set up JDK 11 + - name: Set up JDK 8 uses: actions/setup-java@v2 with: - java-version: '11' + java-version: '8' distribution: 'adopt' - name: Build with Maven run: mvn --batch-mode --update-snapshots verify From 90a0dba18b4042b92ee063d5f94ba6afe2fe1c26 Mon Sep 17 00:00:00 2001 From: danglotb Date: Thu, 17 Jun 2021 10:01:38 +0200 Subject: [PATCH 4/9] ci: split build and test maven steps --- .github/workflows/mvn-build-action.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/mvn-build-action.yml b/.github/workflows/mvn-build-action.yml index 6f92da90..94621f38 100644 --- a/.github/workflows/mvn-build-action.yml +++ b/.github/workflows/mvn-build-action.yml @@ -14,5 +14,7 @@ jobs: java-version: '8' distribution: 'adopt' - name: Build with Maven - run: mvn --batch-mode --update-snapshots verify + run: mvn install -DskipTests + - name: Test with Maven + run: mvn test From cf683dad8b3a5fccc2e8934b74a3d9d5cb661b7a Mon Sep 17 00:00:00 2001 From: danglotb Date: Thu, 17 Jun 2021 10:05:46 +0200 Subject: [PATCH 5/9] ci: prepare the binaries of test resources before testing --- .github/workflows/mvn-build-action.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/mvn-build-action.yml b/.github/workflows/mvn-build-action.yml index 94621f38..61b083b3 100644 --- a/.github/workflows/mvn-build-action.yml +++ b/.github/workflows/mvn-build-action.yml @@ -15,6 +15,8 @@ jobs: distribution: 'adopt' - name: Build with Maven run: mvn install -DskipTests + - name: Prepare resources binaries + run: ./src/compile-and-clean-test-projects.sh - name: Test with Maven run: mvn test From 44bd724eee75480110e02ea191f094d4cb57bb9a Mon Sep 17 00:00:00 2001 From: danglotb Date: Thu, 17 Jun 2021 10:08:04 +0200 Subject: [PATCH 6/9] ci: export MAVEN HOME --- .github/workflows/mvn-build-action.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/mvn-build-action.yml b/.github/workflows/mvn-build-action.yml index 61b083b3..a9941e96 100644 --- a/.github/workflows/mvn-build-action.yml +++ b/.github/workflows/mvn-build-action.yml @@ -15,6 +15,8 @@ jobs: distribution: 'adopt' - name: Build with Maven run: mvn install -DskipTests + - name: Export Maven Home + run: export MAVEN_HOME=/usr/local/maven-3.5.0 - name: Prepare resources binaries run: ./src/compile-and-clean-test-projects.sh - name: Test with Maven From 0c22b1068af0c04d6854267e27a92d1da22ba311 Mon Sep 17 00:00:00 2001 From: danglotb Date: Thu, 17 Jun 2021 10:12:04 +0200 Subject: [PATCH 7/9] ci: setup MAVEN HOME --- .github/workflows/mvn-build-action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/mvn-build-action.yml b/.github/workflows/mvn-build-action.yml index a9941e96..ebc099ea 100644 --- a/.github/workflows/mvn-build-action.yml +++ b/.github/workflows/mvn-build-action.yml @@ -16,7 +16,7 @@ jobs: - name: Build with Maven run: mvn install -DskipTests - name: Export Maven Home - run: export MAVEN_HOME=/usr/local/maven-3.5.0 + run: export MAVEN_HOME=`mvn --version | grep 'Maven home' | sed -e 's/Maven h.* //'` && echo "🎉 ${MAVEN_HOME} " - name: Prepare resources binaries run: ./src/compile-and-clean-test-projects.sh - name: Test with Maven From 453b21a3357b583c5b7466b8451421307af09d97 Mon Sep 17 00:00:00 2001 From: danglotb Date: Thu, 17 Jun 2021 10:18:58 +0200 Subject: [PATCH 8/9] debug: enable debugging for ci --- .../java/eu/stamp_project/testrunner/maven/EntryPoint.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/eu/stamp_project/testrunner/maven/EntryPoint.java b/src/main/java/eu/stamp_project/testrunner/maven/EntryPoint.java index 76360d5c..866acc45 100644 --- a/src/main/java/eu/stamp_project/testrunner/maven/EntryPoint.java +++ b/src/main/java/eu/stamp_project/testrunner/maven/EntryPoint.java @@ -180,13 +180,14 @@ private static void setMavenHome() { LOGGER.warn("Trying to lookup for maven home."); LOGGER.warn("This can fail, and thus lead to a crash of the application."); LOGGER.warn("You can set this value using the field mavenHome or defining the following property: MAVEN_HOME or M2_HOME"); + LOGGER.debug("{}", System.getenv().get("MAVEN_HOME")); mavenHome = getMavenHome(envVariable -> System.getenv().get(envVariable) != null, envVariable -> System.getenv().get(envVariable), "MAVEN_HOME", "M2_HOME"); if (mavenHome == null) { mavenHome = getMavenHome(path -> new File(path).exists(), Function.identity(), - "/usr/share/maven/", "/usr/local/maven-3.3.9/", "/usr/share/maven3/"); + "/usr/share/maven/", "/usr/local/maven-3.3.9/", "/usr/share/maven3/", "/usr/share/apache-maven-3.8.1"); if (mavenHome == null) { throw new RuntimeException("Maven home not found, please set properly MAVEN_HOME or M2_HOME."); } From 05985d40a7982a6bd9ea59d812f00e0851ce304e Mon Sep 17 00:00:00 2001 From: danglotb Date: Thu, 17 Jun 2021 10:23:18 +0200 Subject: [PATCH 9/9] ci: remove debugging line --- src/main/java/eu/stamp_project/testrunner/maven/EntryPoint.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/eu/stamp_project/testrunner/maven/EntryPoint.java b/src/main/java/eu/stamp_project/testrunner/maven/EntryPoint.java index 866acc45..e0e1bfe8 100644 --- a/src/main/java/eu/stamp_project/testrunner/maven/EntryPoint.java +++ b/src/main/java/eu/stamp_project/testrunner/maven/EntryPoint.java @@ -180,7 +180,6 @@ private static void setMavenHome() { LOGGER.warn("Trying to lookup for maven home."); LOGGER.warn("This can fail, and thus lead to a crash of the application."); LOGGER.warn("You can set this value using the field mavenHome or defining the following property: MAVEN_HOME or M2_HOME"); - LOGGER.debug("{}", System.getenv().get("MAVEN_HOME")); mavenHome = getMavenHome(envVariable -> System.getenv().get(envVariable) != null, envVariable -> System.getenv().get(envVariable), "MAVEN_HOME", "M2_HOME");