From bab01a84ab7115bb156b00a80cf5fc885aed94aa Mon Sep 17 00:00:00 2001
From: amai2012 <amai2012@users.noreply.github.com>
Date: Thu, 30 Jul 2020 10:36:06 +0200
Subject: [PATCH] Githubactions update (#2729)

* Use upload-artifact@v2 (not the preview anymore)
* Upload artifacts for CI-unixish
* Use -j$(nproc) for make
---
 .github/workflows/CI-unixish.yml | 26 ++++++++++++++++++++------
 .github/workflows/CI-windows.yml | 18 +++++++++---------
 .github/workflows/buildman.yml   |  2 +-
 3 files changed, 30 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/CI-unixish.yml b/.github/workflows/CI-unixish.yml
index 95e94d27c..55a569b39 100644
--- a/.github/workflows/CI-unixish.yml
+++ b/.github/workflows/CI-unixish.yml
@@ -39,24 +39,38 @@ jobs:
       - name: Build cppcheck
         run: |
           cp externals/z3_version_old.h externals/z3_version.h
-          make -j2 USE_Z3=yes HAVE_RULES=yes
+          make -j$(nproc) USE_Z3=yes HAVE_RULES=yes
 
       - name: Build test
         run: |
-          make -j2 testrunner USE_Z3=yes HAVE_RULES=yes
+          make -j$(nproc) testrunner USE_Z3=yes HAVE_RULES=yes
 
       - name: Run test
         run: |
-          make -j2 check USE_Z3=yes HAVE_RULES=yes
+          make -j$(nproc) check USE_Z3=yes HAVE_RULES=yes
 
       - name: Validate
         run: |
-          make validateCFG
-          make validatePlatforms
+          make -j$(nproc) validateCFG validatePlatforms
           
       - name: Build GUI on ubuntu
         if: matrix.os == 'ubuntu-latest'
         run: |
           pushd gui
           qmake HAVE_QCHART=yes
-          make -j2
+          make -j$(nproc)
+
+      - uses: actions/upload-artifact@v2
+        with:
+          name: cppcheck_cli
+          path: ./cppcheck
+    
+      - uses: actions/upload-artifact@v2
+        with:
+          name: cppcheck_cli
+          path: ./**/cfg/*.cfg
+        
+      - uses: actions/upload-artifact@v2
+        with:
+          name: cppcheck_cli
+          path: ./**/platforms/*.xml
diff --git a/.github/workflows/CI-windows.yml b/.github/workflows/CI-windows.yml
index 88575a4b8..e8d3ec460 100644
--- a/.github/workflows/CI-windows.yml
+++ b/.github/workflows/CI-windows.yml
@@ -80,47 +80,47 @@ jobs:
       - name: Run Release test
         run: .\bin\testrunner.exe
  
-      - uses: actions/upload-artifact@v2-preview
+      - uses: actions/upload-artifact@v2
         with:
           name: cppcheck_gui
           path: Build\gui
           
-      - uses: actions/upload-artifact@v2-preview
+      - uses: actions/upload-artifact@v2
         with:
           name: cppcheck_gui
           path: ./**/cfg/*.cfg
         
-      - uses: actions/upload-artifact@v2-preview
+      - uses: actions/upload-artifact@v2
         with:
           name: cppcheck_gui
           path: ./**/platforms/*.xml  
           
-      - uses: actions/upload-artifact@v2-preview
+      - uses: actions/upload-artifact@v2
         with:
           name: cppcheck_gui
           path: externals\z3\bin\*.dll
         
-      - uses: actions/upload-artifact@v2-preview
+      - uses: actions/upload-artifact@v2
         with:
           name: cppcheck_cli
           path: ./bin/cppcheck.exe
         
-      - uses: actions/upload-artifact@v2-preview
+      - uses: actions/upload-artifact@v2
         with:
           name: cppcheck_cli
           path: ./bin/cppcheck-core.dll
           
-      - uses: actions/upload-artifact@v2-preview
+      - uses: actions/upload-artifact@v2
         with:
           name: cppcheck_cli
           path: externals\z3\bin\*.dll
           
-      - uses: actions/upload-artifact@v2-preview
+      - uses: actions/upload-artifact@v2
         with:
           name: cppcheck_cli
           path: ./**/cfg/*.cfg
         
-      - uses: actions/upload-artifact@v2-preview
+      - uses: actions/upload-artifact@v2
         with:
           name: cppcheck_cli
           path: ./**/platforms/*.xml
diff --git a/.github/workflows/buildman.yml b/.github/workflows/buildman.yml
index 15c53922f..5164982a8 100644
--- a/.github/workflows/buildman.yml
+++ b/.github/workflows/buildman.yml
@@ -15,7 +15,7 @@ jobs:
         with:
           args: --output=output/manual.pdf man/manual.md
 
-      - uses: actions/upload-artifact@master
+      - uses: actions/upload-artifact@v2
         with:
           name: output
           path: output