You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by jo...@apache.org on 2020/03/24 20:42:45 UTC

[nifi] branch master updated: NIFI-7238 Improve Caching for Github CI and relax core usage to not max out cores all moving toward more stable builds.

This is an automated email from the ASF dual-hosted git repository.

joewitt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nifi.git


The following commit(s) were added to refs/heads/master by this push:
     new 4d84c14  NIFI-7238 Improve Caching for Github CI and relax core usage to not max out cores all moving toward more stable builds.
4d84c14 is described below

commit 4d84c144d2e03ad43d78cf12481ce245d6f57d74
Author: Joe Witt <jo...@apache.org>
AuthorDate: Tue Mar 24 12:49:26 2020 -0400

    NIFI-7238 Improve Caching for Github CI and relax core usage to not max out cores all moving toward more stable builds.
    
    Signed-off-by: Joe Witt <jo...@apache.org>
---
 .github/workflows/ci-workflow.yml | 124 +++++++++++++++++++++++++++-----------
 1 file changed, 90 insertions(+), 34 deletions(-)

diff --git a/.github/workflows/ci-workflow.yml b/.github/workflows/ci-workflow.yml
index 0f86629..0e4d979 100644
--- a/.github/workflows/ci-workflow.yml
+++ b/.github/workflows/ci-workflow.yml
@@ -16,37 +16,51 @@ jobs:
       uses: actions/cache@v1.1.2
       with:
         path: ~/.npm
-        key: linux-1.8-npm-${{ hashFiles('**/package-lock.json') }}
+        key: nix-npm-${{ hashFiles('**/package-lock.json') }}
         restore-keys: |
-          linux-1.8-npm-
+          nix-npm-
     - name: Check Maven Com Cache
       uses: actions/cache@v1.1.2
       with:
         path: ~/.m2/repository/com
-        key: linux-1.8-maven-com-${{ hashFiles('**/pom.xml') }}
+        key: nix-maven-com-${{ hashFiles('**/pom.xml') }}
         restore-keys: |
-          linux-1.8-maven-com-
+          nix-maven-com-
     - name: Check Maven Org Cache
       uses: actions/cache@v1.1.2
       with:
         path: ~/.m2/repository/org
-        key: linux-1.8-maven-org-${{ hashFiles('**/pom.xml') }}
+        key: nix-maven-org-${{ hashFiles('**/pom.xml') }}
         restore-keys: |
-          linux-1.8-maven-org-
+          nix-maven-org-
     - name: Check Maven Net Cache
       uses: actions/cache@v1.1.2
       with:
         path: ~/.m2/repository/net
-        key: linux-1.8-maven-net-${{ hashFiles('**/pom.xml') }}
+        key: nix-maven-net-${{ hashFiles('**/pom.xml') }}
         restore-keys: |
-          linux-1.8-maven-net-
+          nix-maven-net-
     - name: Check Maven IO Cache
       uses: actions/cache@v1.1.2
       with:
         path: ~/.m2/repository/io
-        key: linux-1.8-maven-io-${{ hashFiles('**/pom.xml') }}
+        key: nix-maven-io-${{ hashFiles('**/pom.xml') }}
         restore-keys: |
-          linux-1.8-maven-io-
+          nix-maven-io-
+    - name: Check Maven BIZ Cache
+      uses: actions/cache@v1.1.2
+      with:
+        path: ~/.m2/repository/biz
+        key: nix-maven-biz-${{ hashFiles('**/pom.xml') }}
+        restore-keys: |
+          nix-maven-biz-
+    - name: Check Maven IT Cache
+      uses: actions/cache@v1.1.2
+      with:
+        path: ~/.m2/repository/it
+        key: nix-maven-it-${{ hashFiles('**/pom.xml') }}
+        restore-keys: |
+          nix-maven-it-
     - name: Set up JDK 1.8 FR
       uses: actions/setup-java@v1.3.0
       with:
@@ -56,7 +70,7 @@ jobs:
         MAVEN_OPTS: -Xmx2g -XX:ReservedCodeCacheSize=1g -XX:+UseG1GC -Dorg.slf4j.simpleLogger.defaultLogLevel=WARN -Dmaven.surefire.arguments="-Duser.language=fr -Duser.region=FR -Duser.timezone=Europe/Paris"
       run: |
         mvn -version
-        mvn -T 1C install -B -Pcontrib-check,include-grpc -Ddir-only -ntp -ff
+        mvn -T 0.8C install -B -Pcontrib-check,include-grpc -Ddir-only -ntp -ff
         rm -rf ~/.m2/repository/org/apache/nifi
 
   ubuntu-build-en:
@@ -72,37 +86,51 @@ jobs:
         uses: actions/cache@v1.1.2
         with:
           path: ~/.npm
-          key: linux-1.11-npm-${{ hashFiles('**/package-lock.json') }}
+          key: nix-npm-${{ hashFiles('**/package-lock.json') }}
           restore-keys: |
-            linux-1.11-npm-
+            nix-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') }}
+          key: nix-maven-com-${{ hashFiles('**/pom.xml') }}
           restore-keys: |
-            linux-1.11-maven-com-
+            nix-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') }}
+          key: nix-maven-org-${{ hashFiles('**/pom.xml') }}
           restore-keys: |
-            linux-1.11-maven-org-
+            nix-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') }}
+          key: nix-maven-net-${{ hashFiles('**/pom.xml') }}
           restore-keys: |
-            linux-1.11-maven-net-
+            nix-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') }}
+          key: nix-maven-io-${{ hashFiles('**/pom.xml') }}
+          restore-keys: |
+            nix-maven-io-
+      - name: Check Maven BIZ Cache
+        uses: actions/cache@v1.1.2
+        with:
+          path: ~/.m2/repository/biz
+          key: nix-maven-biz-${{ hashFiles('**/pom.xml') }}
+          restore-keys: |
+            nix-maven-biz-
+      - name: Check Maven IT Cache
+        uses: actions/cache@v1.1.2
+        with:
+          path: ~/.m2/repository/it
+          key: nix-maven-it-${{ hashFiles('**/pom.xml') }}
           restore-keys: |
-            linux-1.11-maven-io-
+            nix-maven-it-
       - name: Set up JDK 11 EN
         uses: actions/setup-java@v1.3.0
         with:
@@ -112,7 +140,7 @@ jobs:
           MAVEN_OPTS: -Xmx2g -XX:ReservedCodeCacheSize=1g -XX:+UseG1GC -Dorg.slf4j.simpleLogger.defaultLogLevel=WARN -Dmaven.surefire.arguments="-Duser.language=en -Duser.region=AU -Duser.timezone=Australia/Melbourne"
         run: |
           mvn -version
-          mvn -T 1C install -B -Pcontrib-check,include-grpc -Ddir-only -ntp -ff
+          mvn -T 0.8C install -B -Pcontrib-check,include-grpc -Ddir-only -ntp -ff
           rm -rf ~/.m2/repository/org/apache/nifi
 
   osx-build-jp:
@@ -128,37 +156,51 @@ jobs:
         uses: actions/cache@v1.1.2
         with:
           path: ~/.npm
-          key: linux-1.8osx-npm-${{ hashFiles('**/package-lock.json') }}
+          key: nix-npm-${{ hashFiles('**/package-lock.json') }}
           restore-keys: |
-            linux-1.8osx-npm-
+            nix-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') }}
+          key: nix-maven-com-${{ hashFiles('**/pom.xml') }}
           restore-keys: |
-            linux-1.8osx-maven-com-
+            nix-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') }}
+          key: nix-maven-org-${{ hashFiles('**/pom.xml') }}
           restore-keys: |
-            linux-1.8osx-maven-org-
+            nix-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') }}
+          key: nix-maven-net-${{ hashFiles('**/pom.xml') }}
           restore-keys: |
-            linux-1.8osx-maven-net-
+            nix-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') }}
+          key: nix-maven-io-${{ hashFiles('**/pom.xml') }}
           restore-keys: |
-            linux-1.8osx-maven-io-
+            nix-maven-io-
+      - name: Check Maven BIZ Cache
+        uses: actions/cache@v1.1.2
+        with:
+          path: ~/.m2/repository/biz
+          key: nix-maven-biz-${{ hashFiles('**/pom.xml') }}
+          restore-keys: |
+            nix-maven-biz-
+      - name: Check Maven IT Cache
+        uses: actions/cache@v1.1.2
+        with:
+          path: ~/.m2/repository/it
+          key: nix-maven-it-${{ hashFiles('**/pom.xml') }}
+          restore-keys: |
+            nix-maven-it-
       - name: Set up JDK 1.8 JP
         uses: actions/setup-java@v1.3.0
         with:
@@ -168,7 +210,7 @@ jobs:
           MAVEN_OPTS: -Xmx2g -XX:ReservedCodeCacheSize=1g -XX:+UseG1GC -Dorg.slf4j.simpleLogger.defaultLogLevel=WARN -Dmaven.surefire.arguments="-Duser.language=ja -Duser.region=JP -Duser.timezone=Asia/Tokyo"
         run: |
           mvn -version
-          mvn -T 1C install -B -Pcontrib-check,include-grpc -Ddir-only -ntp -ff
+          mvn -T 0.8C install -B -Pcontrib-check,include-grpc -Ddir-only -ntp -ff
           rm -rf ~/.m2/repository/org/apache/nifi
 
   windows-build:
@@ -211,6 +253,20 @@ jobs:
           key: windows-maven-io-${{ hashFiles('**\pom.xml') }}
           restore-keys: |
             windows-maven-io-
+      - name: Check Maven BIZ Cache
+        uses: actions/cache@v1.1.2
+        with:
+          path: ~\.m2\repository\biz
+          key: nix-maven-biz-${{ hashFiles('**\pom.xml') }}
+          restore-keys: |
+            nix-maven-biz-
+      - name: Check Maven IT Cache
+        uses: actions/cache@v1.1.2
+        with:
+          path: ~\.m2\repository\it
+          key: nix-maven-it-${{ hashFiles('**\pom.xml') }}
+          restore-keys: |
+            nix-maven-it-
       - name: Set up JDK 1.8
         uses: actions/setup-java@v1.3.0
         with:
@@ -220,5 +276,5 @@ jobs:
           MAVEN_OPTS: -Xmx2g -Dorg.slf4j.simpleLogger.defaultLogLevel=WARN -Dmaven.surefire.arguments="-Duser.language=en -Duser.region=US -Duser.timezone=US/Pacific"
         run: |
           mvn -version
-          mvn -T 1C install -B -Ddir-only -ntp -ff
+          mvn -T 0.8C install -B -Ddir-only -ntp -ff
           Remove-Item -path '~\.m2\repository\org\apache\nifi' -recurse -force