From 684e6483b57d1b17596adff983362d7f77d8ce99 Mon Sep 17 00:00:00 2001 From: Artem Gavrilov Date: Fri, 5 Apr 2024 19:42:40 +0200 Subject: [PATCH] Fix cppcheck workflow (#441) * Upgrade ubuntu from 20.04 to 22.04 * Temporary remove all workflows except cppcheck * Try ununty 23.10 * Revert "Try ununty 23.10" This reverts commit c8590b60ed5c98ff5449d4efb5bf3a9d892cddd2. * Try cppcheck built from sources * Add sudo * Bump checkout action version in cppcheck workflow * Revert "Temporary remove all workflows except cppcheck" This reverts commit 9f32e94992ebb3612f2f399af1a18646a43a2ee2. --- .github/workflows/cppcheck.yml | 23 +++++++++++++++---- .../workflows/postgresql-11-pgdg-package.yml | 2 +- .../workflows/postgresql-11-ppg-package.yml | 2 +- .../workflows/postgresql-12-pgdg-package.yml | 2 +- .../workflows/postgresql-12-ppg-package.yml | 2 +- .../workflows/postgresql-13-pgdg-package.yml | 2 +- .../workflows/postgresql-13-ppg-package.yml | 2 +- .../workflows/postgresql-14-pgdg-package.yml | 2 +- .../workflows/postgresql-14-ppg-package.yml | 2 +- 9 files changed, 27 insertions(+), 12 deletions(-) diff --git a/.github/workflows/cppcheck.yml b/.github/workflows/cppcheck.yml index d2f5d41..90d93f6 100644 --- a/.github/workflows/cppcheck.yml +++ b/.github/workflows/cppcheck.yml @@ -4,12 +4,27 @@ on: [push] jobs: build: name: cppcheck-test - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@v2 - - name: install cppcheck - run: sudo apt-get install cppcheck + - name: Checkout sources + uses: actions/checkout@v4 + + - name: Checkout cppcheck sources + uses: actions/checkout@v4 + with: + repository: 'danmar/cppcheck' + ref: '2.13.4' + path: src/cppcheck + + - name: Build and install cppcheck + run: | + mkdir build + cd build + cmake .. + cmake --build . + sudo cmake --install . + working-directory: src/cppcheck - name: Execute linter check with cppcheck run: | diff --git a/.github/workflows/postgresql-11-pgdg-package.yml b/.github/workflows/postgresql-11-pgdg-package.yml index c596425..258cb63 100644 --- a/.github/workflows/postgresql-11-pgdg-package.yml +++ b/.github/workflows/postgresql-11-pgdg-package.yml @@ -4,7 +4,7 @@ on: [pull_request] jobs: build: name: pg-11-pgdg-package-test - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - name: Clone pg_stat_monitor repository uses: actions/checkout@v2 diff --git a/.github/workflows/postgresql-11-ppg-package.yml b/.github/workflows/postgresql-11-ppg-package.yml index 141aa23..caf81ff 100644 --- a/.github/workflows/postgresql-11-ppg-package.yml +++ b/.github/workflows/postgresql-11-ppg-package.yml @@ -4,7 +4,7 @@ on: [push] jobs: build: name: pg-11-ppg-package-test - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - name: Clone pg_stat_monitor repository uses: actions/checkout@v2 diff --git a/.github/workflows/postgresql-12-pgdg-package.yml b/.github/workflows/postgresql-12-pgdg-package.yml index 54745cb..02ed043 100644 --- a/.github/workflows/postgresql-12-pgdg-package.yml +++ b/.github/workflows/postgresql-12-pgdg-package.yml @@ -4,7 +4,7 @@ on: [pull_request] jobs: build: name: pg-12-pgdg-package-test - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - name: Clone pg_stat_monitor repository uses: actions/checkout@v2 diff --git a/.github/workflows/postgresql-12-ppg-package.yml b/.github/workflows/postgresql-12-ppg-package.yml index 4c7231d..e928186 100644 --- a/.github/workflows/postgresql-12-ppg-package.yml +++ b/.github/workflows/postgresql-12-ppg-package.yml @@ -4,7 +4,7 @@ on: [push] jobs: build: name: pg-12-ppg-package-test - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - name: Clone pg_stat_monitor repository uses: actions/checkout@v2 diff --git a/.github/workflows/postgresql-13-pgdg-package.yml b/.github/workflows/postgresql-13-pgdg-package.yml index 000726e..8cf3151 100644 --- a/.github/workflows/postgresql-13-pgdg-package.yml +++ b/.github/workflows/postgresql-13-pgdg-package.yml @@ -4,7 +4,7 @@ on: [pull_request] jobs: build: name: pg-13-pgdg-package-test - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - name: Clone pg_stat_monitor repository uses: actions/checkout@v2 diff --git a/.github/workflows/postgresql-13-ppg-package.yml b/.github/workflows/postgresql-13-ppg-package.yml index a9457b0..eca350d 100644 --- a/.github/workflows/postgresql-13-ppg-package.yml +++ b/.github/workflows/postgresql-13-ppg-package.yml @@ -4,7 +4,7 @@ on: [push] jobs: build: name: pg-13-ppg-package-test - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - name: Clone pg_stat_monitor repository uses: actions/checkout@v2 diff --git a/.github/workflows/postgresql-14-pgdg-package.yml b/.github/workflows/postgresql-14-pgdg-package.yml index 3ac03ed..f93fe18 100644 --- a/.github/workflows/postgresql-14-pgdg-package.yml +++ b/.github/workflows/postgresql-14-pgdg-package.yml @@ -4,7 +4,7 @@ on: [pull_request] jobs: build: name: pg-14-pgdg-package-test - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - name: Clone pg_stat_monitor repository uses: actions/checkout@v2 diff --git a/.github/workflows/postgresql-14-ppg-package.yml b/.github/workflows/postgresql-14-ppg-package.yml index 42721dd..3d6b857 100644 --- a/.github/workflows/postgresql-14-ppg-package.yml +++ b/.github/workflows/postgresql-14-ppg-package.yml @@ -4,7 +4,7 @@ on: [push] jobs: build: name: pg-14-ppg-package-test - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - name: Clone pg_stat_monitor repository uses: actions/checkout@v2