Merge branch 'feature/using_docker_in_actions' into fix/fixing_launch…

…test
ros · Mar 28, 2024 · 4930a46 · 4930a46
2 parents 806ff8a + d2b92fd
commit 4930a46
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -32,11 +32,11 @@ jobs:
     runs-on: ubuntu-latest
     container: ubuntu:${{ matrix.os }}
     steps:
-      - uses: ros-tooling/setup-ros@christophebedard/ubuntu-noble-rolling
-      - run: |
-          sudo apt install -y python3-pip
-          pip3 install --break-system-packages 'flake8<5' # fix flake8.exceptions.FailedToLoadPlugin: Flake8 failed to load plugin "pycodestyle" due to cannot import name 'missing_whitespace_around_operator' from 'pycodestyle' (/usr/lib/python3/dist-packages/pycodestyle.py).
-        if: ${{ matrix.os == '24.04' }}
+      - uses: ros-tooling/setup-ros@master
+      # - run: |
+      #     sudo apt install -y python3-pip
+      #     pip3 install --break-system-packages 'flake8<5' # fix flake8.exceptions.FailedToLoadPlugin: Flake8 failed to load plugin "pycodestyle" due to cannot import name 'missing_whitespace_around_operator' from 'pycodestyle' (/usr/lib/python3/dist-packages/pycodestyle.py).
+      #   if: ${{ matrix.os == '24.04' }}
       - uses: ros-tooling/action-ros-ci@master
         with:
           target-ros2-distro: ${{ matrix.distro }}

diff --git a/self_test/CMakeLists.txt b/self_test/CMakeLists.txt
@@ -67,6 +67,10 @@ if(BUILD_TESTING)
   set(ament_cmake_copyright_FOUND TRUE)
   ament_lint_auto_find_test_dependencies()
 
+  list(APPEND AMENT_LINT_AUTO_EXCLUDE
+    ament_cmake_uncrustify  # Inconsistent between jammy and noble
+  )
+
   add_subdirectory(test)
 endif()