From da721ff0d491cc4fa290e536be709913b078a71c Mon Sep 17 00:00:00 2001
From: ISP akm <akm@isp.co.jp>
Date: Sat, 22 Jun 2024 02:12:38 +0900
Subject: [PATCH] remove snapd and ros2 container

Signed-off-by: ISP akm <akm@isp.co.jp>
---
 .github/workflows/cppcheck-all-files.yaml    |  8 ++++++--
 .github/workflows/cppcheck-differential.yaml | 10 +++++++---
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/cppcheck-all-files.yaml b/.github/workflows/cppcheck-all-files.yaml
index 76a5c338..0ae5c4a4 100644
--- a/.github/workflows/cppcheck-all-files.yaml
+++ b/.github/workflows/cppcheck-all-files.yaml
@@ -7,7 +7,6 @@ on:
 jobs:
   cppcheck-all-files:
     runs-on: ubuntu-latest
-    container: ros:humble
     steps:
       - name: Check out repository
         uses: actions/checkout@v4
@@ -17,7 +16,12 @@ jobs:
       - name: Install dependencies
         run: |
           sudo apt-get update
-          sudo apt-get install -y cppcheck=2.14.2 wget
+          sudo apt-get install -y wget
+
+      # cppcheck from apt does not yet support --check-level args, and thus install from snap
+      - name: Install Cppcheck from snap
+        run: |
+          sudo snap install cppcheck
 
       # Download the cppcheck suppression file
       - name: Download cppcheck suppression file
diff --git a/.github/workflows/cppcheck-differential.yaml b/.github/workflows/cppcheck-differential.yaml
index d3b79d2c..99016b34 100644
--- a/.github/workflows/cppcheck-differential.yaml
+++ b/.github/workflows/cppcheck-differential.yaml
@@ -6,7 +6,6 @@ on:
 jobs:
   cppcheck-differential:
     runs-on: ubuntu-latest
-    container: ros:humble
     steps:
       - name: Check out repository
         uses: actions/checkout@v4
@@ -16,7 +15,12 @@ jobs:
       - name: Install dependencies
         run: |
           sudo apt-get update
-          sudo apt-get install -y cppcheck=2.14.2 wget
+          sudo apt-get install -y wget
+
+      # cppcheck from apt does not yet support --check-level args, and thus install from snap
+      - name: Install Cppcheck from snap
+        run: |
+          sudo snap install cppcheck
 
       # Download the cppcheck suppression file
       - name: Download cppcheck suppression file
@@ -57,7 +61,7 @@ jobs:
           cat cppcheck-report.txt
 
       - name: Upload Cppcheck report
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v44
         with:
           name: cppcheck-report
           path: cppcheck-report.txt