Working to bring CI back to green (#1015)

* drop python 2.7 no longer supported on github actions. * move to noetic and focal from melodic and bionic * pin empy to less than 4 * move from foxy to humble * focal to jammy for humble only * Use Ubuntu Noble for Rolling builds Co-authored-by: Scott K Logan <[email protected]>
ros-infrastructure · Mar 15, 2024 · f8d8219 · f8d8219
1 parent 050666f
commit f8d8219
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 67 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -25,7 +25,7 @@ jobs:
     runs-on: ubuntu-20.04
     strategy:
       matrix:
-        python: ['2.7', '3.6']
+        python: ['3.6']
     steps:
       - name: Check out project
         uses: actions/checkout@v2
@@ -38,8 +38,8 @@ jobs:
       - name: Run job
         uses: ./.github/actions/audit
         with:
-          ros_distro: melodic
-          os_code_name: bionic
+          ros_distro: noetic
+          os_code_name: focal
 
   ros1_config:
     name: ROS 1 Config Validation
@@ -52,39 +52,12 @@ jobs:
       - name: Validate configration
         run: validate_config_index.py https://raw.githubusercontent.com/ros-infrastructure/ros_buildfarm_config/production/index.yaml
 
-  ros1_devel:
-    name: ROS 1 Devel
-    runs-on: ubuntu-20.04
-    strategy:
-      matrix:
-        python: ['2.7', '3.5', '3.6']
-        build_tool: [null]
-        include:
-          - python: '3.6'
-            build_tool: colcon
-    steps:
-      - name: Check out project
-        uses: actions/checkout@v2
-      - name: Set up Python
-        uses: actions/setup-python@v2
-        with:
-          python-version: ${{matrix.python}}
-      - name: Install dependencies
-        uses: ./.github/actions/setup
-      - name: Run job
-        uses: ./.github/actions/devel
-        with:
-          ros_distro: melodic
-          os_code_name: bionic
-          build_tool: ${{matrix.build_tool}}
-          repo: roscpp_core
-
   ros1_doc:
     name: ROS 1 Doc
     runs-on: ubuntu-20.04
     strategy:
       matrix:
-        python: ['2.7', '3.5', '3.6']
+        python: ['3.5', '3.6']
     steps:
       - name: Check out project
         uses: actions/checkout@v2
@@ -97,16 +70,16 @@ jobs:
       - name: Run job
         uses: ./.github/actions/doc
         with:
-          ros_distro: melodic
-          os_code_name: bionic
+          ros_distro: noetic
+          os_code_name: focal
           repo: roscpp_core
 
   ros1_prerelease:
     name: ROS 1 Prerelease
     runs-on: ubuntu-20.04
     strategy:
       matrix:
-        python: ['2.7', '3.5', '3.6']
+        python: ['3.5', '3.6']
     steps:
       - name: Check out project
         uses: actions/checkout@v2
@@ -119,8 +92,8 @@ jobs:
       - name: Run job
         uses: ./.github/actions/prerelease
         with:
-          ros_distro: melodic
-          os_code_name: bionic
+          ros_distro: noetic
+          os_code_name: focal
           overlay_pkg: roscpp
           underlay_repos: roscpp_core
 
@@ -129,7 +102,7 @@ jobs:
     runs-on: ubuntu-20.04
     strategy:
       matrix:
-        python: ['2.7', '3.5', '3.6']
+        python: ['3.5', '3.6']
     steps:
       - name: Check out project
         uses: actions/checkout@v2
@@ -148,16 +121,16 @@ jobs:
       - name: Run job
         uses: ./.github/actions/prerelease
         with:
-          ros_distro: melodic
-          os_code_name: bionic
+          ros_distro: noetic
+          os_code_name: focal
           source_dir: ${{github.workspace}}/dummy_package
 
   ros1_release:
     name: ROS 1 Release
     runs-on: ubuntu-20.04
     strategy:
       matrix:
-        python: ['2.7', '3.5', '3.6']
+        python: ['3.5', '3.6']
     steps:
       - name: Check out project
         uses: actions/checkout@v2
@@ -170,16 +143,16 @@ jobs:
       - name: Run job
         uses: ./.github/actions/release
         with:
-          ros_distro: melodic
-          os_code_name: bionic
+          ros_distro: noetic
+          os_code_name: focal
           pkg_name: rostime
 
   ros1_release_reconfigure:
     name: ROS 1 Release Reconfigure
     runs-on: ubuntu-20.04
     strategy:
       matrix:
-        python: ['2.7', '3.5', '3.6']
+        python: ['3.5', '3.6']
     steps:
       - name: Check out project
         uses: actions/checkout@v2
@@ -192,15 +165,15 @@ jobs:
       - name: Run job
         uses: ./.github/actions/release_reconfigure
         with:
-          ros_distro: melodic
+          ros_distro: noetic
           pkg_names: rostime
 
   ros1_status_pages:
     name: ROS 1 Status Pages
     runs-on: ubuntu-20.04
     strategy:
       matrix:
-        python: ['2.7', '3.5', '3.6']
+        python: ['3.5', '3.6']
     steps:
       - name: Check out project
         uses: actions/checkout@v2
@@ -213,14 +186,14 @@ jobs:
       - name: Run job
         uses: ./.github/actions/status_pages
         with:
-          ros_distro: melodic
+          ros_distro: noetic
 
   ros1_sync_criteria_check:
     name: ROS 1 Sync Criteria Check
     runs-on: ubuntu-20.04
     strategy:
       matrix:
-        python: ['2.7', '3.5', '3.6']
+        python: ['3.5', '3.6']
     steps:
       - name: Check out project
         uses: actions/checkout@v2
@@ -229,15 +202,15 @@ jobs:
       - name: Run job
         uses: ./.github/actions/sync_criteria_check
         with:
-          ros_distro: melodic
-          os_code_name: bionic
+          ros_distro: noetic
+          os_code_name: focal
 
   ros1_trigger:
     name: ROS 1 Trigger
     runs-on: ubuntu-20.04
     strategy:
       matrix:
-        python: ['2.7', '3.5', '3.6']
+        python: ['3.5', '3.6']
     steps:
       - name: Check out project
         uses: actions/checkout@v2
@@ -246,7 +219,7 @@ jobs:
       - name: Run job
         uses: ./.github/actions/trigger
         with:
-          ros_distro: melodic
+          ros_distro: noetic
 
   ros2_audit:
     name: ROS 2 Audit
@@ -260,8 +233,8 @@ jobs:
         uses: ./.github/actions/audit
         with:
           config_url: https://raw.githubusercontent.com/ros2/ros_buildfarm_config/ros2/index.yaml
-          ros_distro: foxy
-          os_code_name: focal
+          ros_distro: humble
+          os_code_name: jammy
 
   ros2_ci:
     name: ROS 2 CI
@@ -276,24 +249,24 @@ jobs:
         uses: ./.github/actions/ci
         with:
           config_url: https://raw.githubusercontent.com/ros2/ros_buildfarm_config/ros2/index.yaml
-          ros_distro: foxy
-          os_code_name: focal
+          ros_distro: humble
+          os_code_name: jammy
           package_selection_args: --packages-up-to ament_flake8
       - name: Run job 2
         id: underlay2
         uses: ./.github/actions/ci
         with:
           config_url: https://raw.githubusercontent.com/ros2/ros_buildfarm_config/ros2/index.yaml
-          ros_distro: foxy
-          os_code_name: focal
+          ros_distro: humble
+          os_code_name: jammy
           underlay_dirs: ${{steps.underlay1.outputs.install_dir}}
           package_selection_args: --packages-skip-up-to ament_flake8 --packages-up-to ament_pep257
       - name: Run job 3
         uses: ./.github/actions/ci
         with:
           config_url: https://raw.githubusercontent.com/ros2/ros_buildfarm_config/ros2/index.yaml
-          ros_distro: foxy
-          os_code_name: focal
+          ros_distro: humble
+          os_code_name: jammy
           underlay_dirs: ${{steps.underlay1.outputs.install_dir}} ${{steps.underlay2.outputs.install_dir}}
           package_selection_args: --packages-skip-up-to ament_flake8 ament_pep257 --packages-up-to ament_cmake_ros
 
@@ -320,8 +293,8 @@ jobs:
         uses: ./.github/actions/devel
         with:
           config_url: https://raw.githubusercontent.com/ros2/ros_buildfarm_config/ros2/index.yaml
-          ros_distro: foxy
-          os_code_name: focal
+          ros_distro: humble
+          os_code_name: jammy
           repo: rcutils
 
   ros2_doc:
@@ -337,7 +310,7 @@ jobs:
         with:
           config_url: https://raw.githubusercontent.com/ros2/ros_buildfarm_config/ros2/index.yaml
           ros_distro: rolling
-          os_code_name: jammy
+          os_code_name: noble
           repo: rcl
           output_directory: ws/docs_output
 
@@ -353,8 +326,8 @@ jobs:
         uses: ./.github/actions/prerelease
         with:
           config_url: https://raw.githubusercontent.com/ros2/ros_buildfarm_config/ros2/index.yaml
-          ros_distro: foxy
-          os_code_name: focal
+          ros_distro: humble
+          os_code_name: jammy
           overlay_pkg: rcutils
           underlay_repos: ament_cmake_ros
 
@@ -371,7 +344,7 @@ jobs:
         with:
           config_url: https://raw.githubusercontent.com/ros2/ros_buildfarm_config/ros2/index.yaml
           ros_distro: rolling
-          os_code_name: jammy
+          os_code_name: noble
           pkg_name: rcutils
 
   ros2_release_reconfigure:
@@ -421,7 +394,7 @@ jobs:
         with:
           config_url: https://raw.githubusercontent.com/ros2/ros_buildfarm_config/ros2/index.yaml
           ros_distro: rolling
-          os_code_name: jammy
+          os_code_name: noble
 
   ros2_sync_criteria_check_rpm:
     name: ROS 2 Sync Criteria Check (RPM)

diff --git a/setup.py b/setup.py
@@ -30,7 +30,7 @@
     'include_package_data': True,
     'zip_safe': False,
     'install_requires': [
-        'empy',
+        'empy<4',
         'PyYAML'],
     'extras_require': {
         'test': [