From bad0f10a52de4822147dfb8a13f35eccdbc0bb3c Mon Sep 17 00:00:00 2001 From: Joe Witt Date: Tue, 25 Feb 2020 15:29:50 -0800 Subject: [PATCH] NIFI-7201 - Update build to latest apache-maven-parent and split Github Actions builds to include OSX and distribute localization Signed-off-by: Pierre Villard This closes #4091. --- .github/workflows/ci-workflow.yml | 145 +++++++++++++++--- nifi-commons/nifi-security-utils/pom.xml | 4 - .../nifi-elasticsearch-client-service/pom.xml | 1 - .../nifi-framework/nifi-stateless/pom.xml | 1 - pom.xml | 7 +- 5 files changed, 129 insertions(+), 29 deletions(-) diff --git a/.github/workflows/ci-workflow.yml b/.github/workflows/ci-workflow.yml index 54993c6519..492663d61e 100644 --- a/.github/workflows/ci-workflow.yml +++ b/.github/workflows/ci-workflow.yml @@ -3,14 +3,11 @@ name: ci-workflow on: [push, pull_request] jobs: - ubuntu-build: + ubuntu-build-fr: timeout-minutes: 90 runs-on: ubuntu-latest - strategy: - matrix: - java: [ '1.8', '11' ] - name: Ubuntu Build NiFi - JDK${{ matrix.java }} + name: Ubuntu Build NiFi - JDK 1.8 FR steps: - name: Checkout Code @@ -19,49 +16,161 @@ jobs: uses: actions/cache@v1.1.2 with: path: ~/.npm - key: linux-${{ matrix.java }}-npm-${{ hashFiles('**/package-lock.json') }} + key: linux-1.8-npm-${{ hashFiles('**/package-lock.json') }} restore-keys: | - linux-${{ matrix.java }}-npm- + linux-1.8-npm- - name: Check Maven Com Cache uses: actions/cache@v1.1.2 with: path: ~/.m2/repository/com - key: linux-${{ matrix.java }}-maven-com-${{ hashFiles('**/pom.xml') }} + key: linux-1.8-maven-com-${{ hashFiles('**/pom.xml') }} restore-keys: | - linux-${{ matrix.java }}-maven-com- + linux-1.8-maven-com- - name: Check Maven Org Cache uses: actions/cache@v1.1.2 with: path: ~/.m2/repository/org - key: linux-${{ matrix.java }}-maven-org-${{ hashFiles('**/pom.xml') }} + key: linux-1.8-maven-org-${{ hashFiles('**/pom.xml') }} restore-keys: | - linux-${{ matrix.java }}-maven-org- + linux-1.8-maven-org- - name: Check Maven Net Cache uses: actions/cache@v1.1.2 with: path: ~/.m2/repository/net - key: linux-${{ matrix.java }}-maven-net-${{ hashFiles('**/pom.xml') }} + key: linux-1.8-maven-net-${{ hashFiles('**/pom.xml') }} restore-keys: | - linux-${{ matrix.java }}-maven-net- + linux-1.8-maven-net- - name: Check Maven IO Cache uses: actions/cache@v1.1.2 with: path: ~/.m2/repository/io - key: linux-${{ matrix.java }}-maven-io-${{ hashFiles('**/pom.xml') }} + key: linux-1.8-maven-io-${{ hashFiles('**/pom.xml') }} restore-keys: | - linux-${{ matrix.java }}-maven-io- - - name: Set up JDK ${{ matrix.java }} + linux-1.8-maven-io- + - name: Set up JDK 1.8 FR uses: actions/setup-java@v1.3.0 with: - java-version: ${{ matrix.java }} + java-version: 1.8 - name: Build with Maven env: - MAVEN_OPTS: -Xmx2g -XX:ReservedCodeCacheSize=1g -XX:+UseG1GC -Dorg.slf4j.simpleLogger.defaultLogLevel=WARN + MAVEN_OPTS: -Xmx2g -XX:ReservedCodeCacheSize=1g -XX:+UseG1GC -Dorg.slf4j.simpleLogger.defaultLogLevel=WARN -Dmaven.surefire.arguments="-Duser.language=fr -Duser.region=FR" run: | mvn -version mvn -T 1C install -B -Pcontrib-check,include-grpc -Ddir-only -ntp -ff rm -rf ~/.m2/repository/org/apache/nifi + ubuntu-build-en: + + timeout-minutes: 90 + runs-on: ubuntu-latest + name: Ubuntu Build NiFi - JDK 11 EN + + steps: + - name: Checkout Code + uses: actions/checkout@v2 + - name: Check NPM Cache + uses: actions/cache@v1.1.2 + with: + path: ~/.npm + key: linux-1.11-npm-${{ hashFiles('**/package-lock.json') }} + restore-keys: | + linux-1.11-npm- + - name: Check Maven Com Cache + uses: actions/cache@v1.1.2 + with: + path: ~/.m2/repository/com + key: linux-1.11-maven-com-${{ hashFiles('**/pom.xml') }} + restore-keys: | + linux-1.11-maven-com- + - name: Check Maven Org Cache + uses: actions/cache@v1.1.2 + with: + path: ~/.m2/repository/org + key: linux-1.11-maven-org-${{ hashFiles('**/pom.xml') }} + restore-keys: | + linux-1.11-maven-org- + - name: Check Maven Net Cache + uses: actions/cache@v1.1.2 + with: + path: ~/.m2/repository/net + key: linux-1.11-maven-net-${{ hashFiles('**/pom.xml') }} + restore-keys: | + linux-1.11-maven-net- + - name: Check Maven IO Cache + uses: actions/cache@v1.1.2 + with: + path: ~/.m2/repository/io + key: linux-1.11-maven-io-${{ hashFiles('**/pom.xml') }} + restore-keys: | + linux-1.11-maven-io- + - name: Set up JDK 11 EN + uses: actions/setup-java@v1.3.0 + with: + java-version: 11 + - name: Build with Maven + env: + MAVEN_OPTS: -Xmx2g -XX:ReservedCodeCacheSize=1g -XX:+UseG1GC -Dorg.slf4j.simpleLogger.defaultLogLevel=WARN -Dmaven.surefire.arguments="-Duser.language=en -Duser.region=US" + run: | + mvn -version + mvn -T 1C install -B -Pcontrib-check,include-grpc -Ddir-only -ntp -ff + rm -rf ~/.m2/repository/org/apache/nifi + + osx-build-jp: + + timeout-minutes: 90 + runs-on: macos-latest + name: MacOS Build NiFi - JDK 1.8 JP + + steps: + - name: Checkout Code + uses: actions/checkout@v2 + - name: Check NPM Cache + uses: actions/cache@v1.1.2 + with: + path: ~/.npm + key: linux-1.8osx-npm-${{ hashFiles('**/package-lock.json') }} + restore-keys: | + linux-1.8osx-npm- + - name: Check Maven Com Cache + uses: actions/cache@v1.1.2 + with: + path: ~/.m2/repository/com + key: linux-1.8osx-maven-com-${{ hashFiles('**/pom.xml') }} + restore-keys: | + linux-1.8osx-maven-com- + - name: Check Maven Org Cache + uses: actions/cache@v1.1.2 + with: + path: ~/.m2/repository/org + key: linux-1.8osx-maven-org-${{ hashFiles('**/pom.xml') }} + restore-keys: | + linux-1.8osx-maven-org- + - name: Check Maven Net Cache + uses: actions/cache@v1.1.2 + with: + path: ~/.m2/repository/net + key: linux-1.8osx-maven-net-${{ hashFiles('**/pom.xml') }} + restore-keys: | + linux-1.8osx-maven-net- + - name: Check Maven IO Cache + uses: actions/cache@v1.1.2 + with: + path: ~/.m2/repository/io + key: linux-1.8osx-maven-io-${{ hashFiles('**/pom.xml') }} + restore-keys: | + linux-1.8osx-maven-io- + - name: Set up JDK 1.8 JP + uses: actions/setup-java@v1.3.0 + with: + java-version: 1.8 + - name: Build with Maven + env: + MAVEN_OPTS: -Xmx2g -XX:ReservedCodeCacheSize=1g -XX:+UseG1GC -Dorg.slf4j.simpleLogger.defaultLogLevel=WARN -Dmaven.surefire.arguments="-Duser.language=ja -Duser.region=JP" + run: | + mvn -version + mvn -T 1C install -B -Pcontrib-check,include-grpc -Ddir-only -ntp -ff + rm -rf ~/.m2/repository/org/apache/nifi + windows-build: runs-on: windows-latest diff --git a/nifi-commons/nifi-security-utils/pom.xml b/nifi-commons/nifi-security-utils/pom.xml index 1b14efa963..54ba633e14 100644 --- a/nifi-commons/nifi-security-utils/pom.xml +++ b/nifi-commons/nifi-security-utils/pom.xml @@ -37,10 +37,6 @@ nifi-utils 1.12.0-SNAPSHOT - - - - ch.qos.logback logback-classic diff --git a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-client-service/pom.xml b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-client-service/pom.xml index a7188b9925..7dd583a7b8 100644 --- a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-client-service/pom.xml +++ b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-client-service/pom.xml @@ -87,7 +87,6 @@ org.slf4j log4j-over-slf4j - ${org.slf4j.version} diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-stateless/pom.xml b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-stateless/pom.xml index f71cdf6411..2f5ca867ec 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-stateless/pom.xml +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-stateless/pom.xml @@ -73,7 +73,6 @@ org.slf4j slf4j-api - 1.7.25 diff --git a/pom.xml b/pom.xml index ccef89c948..9007a75b6c 100644 --- a/pom.xml +++ b/pom.xml @@ -13,7 +13,7 @@ org.apache apache - 22 + 23 org.apache.nifi @@ -70,9 +70,6 @@ https://mail-archives.apache.org/mod_mbox/nifi-commits - - ${maven.min-version} - scm:git:git://git.apache.org/nifi.git scm:git:https://git-wip-us.apache.org/repos/asf/nifi.git @@ -91,7 +88,7 @@ UTF-8 UTF-8 2014 - 1.7.26 + 1.7.30 2.0.0 9.4.19.v20190610 2.9.10