From 140142a5a5459b7b2f43ddfe1741298d8ac0708c Mon Sep 17 00:00:00 2001 From: amai2012 Date: Wed, 29 Jul 2020 20:10:26 +0200 Subject: [PATCH 1/5] Update CI-windows.yml Use upload-artifact@v2 not the preview anymore --- .github/workflows/CI-windows.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/CI-windows.yml b/.github/workflows/CI-windows.yml index 88575a4b8ac..e8d3ec460f6 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 From 32b01dcd101322361efc9d38181eb97b349e8c36 Mon Sep 17 00:00:00 2001 From: amai2012 Date: Wed, 29 Jul 2020 20:13:07 +0200 Subject: [PATCH 2/5] Update CI-unixish.yml Upload artifacts --- .github/workflows/CI-unixish.yml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/.github/workflows/CI-unixish.yml b/.github/workflows/CI-unixish.yml index 95e94d27cf5..9368ed2c78b 100644 --- a/.github/workflows/CI-unixish.yml +++ b/.github/workflows/CI-unixish.yml @@ -60,3 +60,18 @@ jobs: pushd gui qmake HAVE_QCHART=yes make -j2 + + - uses: actions/upload-artifact@v2 + with: + name: cppcheck_cli + path: ./bin/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 From 0e98db305512eb161c20cc368d9dd79bcdfea026 Mon Sep 17 00:00:00 2001 From: amai2012 Date: Wed, 29 Jul 2020 20:18:17 +0200 Subject: [PATCH 3/5] Use -j$(nproc) for make --- .github/workflows/CI-unixish.yml | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/.github/workflows/CI-unixish.yml b/.github/workflows/CI-unixish.yml index 9368ed2c78b..f863c5cf21c 100644 --- a/.github/workflows/CI-unixish.yml +++ b/.github/workflows/CI-unixish.yml @@ -39,27 +39,26 @@ 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: From 59014e2f00341a5ac82e572d7d76c6d6e20ea2a6 Mon Sep 17 00:00:00 2001 From: amai2012 Date: Wed, 29 Jul 2020 20:22:29 +0200 Subject: [PATCH 4/5] correct path to cppcheck binary --- .github/workflows/CI-unixish.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/CI-unixish.yml b/.github/workflows/CI-unixish.yml index f863c5cf21c..55a569b393c 100644 --- a/.github/workflows/CI-unixish.yml +++ b/.github/workflows/CI-unixish.yml @@ -63,7 +63,7 @@ jobs: - uses: actions/upload-artifact@v2 with: name: cppcheck_cli - path: ./bin/cppcheck + path: ./cppcheck - uses: actions/upload-artifact@v2 with: From 3d49f39d2110faa3ffa22d04f9d7c7d0efccde7c Mon Sep 17 00:00:00 2001 From: amai2012 Date: Wed, 29 Jul 2020 20:49:48 +0200 Subject: [PATCH 5/5] Use actions/upload-artifact@v2 --- .github/workflows/buildman.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/buildman.yml b/.github/workflows/buildman.yml index 15c53922fd1..5164982a827 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