Skip to content

Commit 57aa95b

Browse files
committed
Merge branch 'main' into xxEoD2242-patch-4
2 parents c62f4f7 + 587d84c commit 57aa95b

2 files changed

Lines changed: 5 additions & 5 deletions

File tree

.github/workflows/test_docs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
- name: Setup Python
1414
uses: actions/setup-python@v4
1515
with:
16-
python-version: '3.7'
16+
python-version: '3.12'
1717
architecture: 'x64'
1818

1919
- name: Install dependencies

.github/workflows/test_ubuntu.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
runs-on: ${{ matrix.os }}
99
strategy:
1010
matrix:
11-
os: [ubuntu-20.04]
11+
os: [ubuntu-22.04, ubuntu-24.04]
1212

1313
steps:
1414
- uses: actions/checkout@v3
@@ -24,16 +24,16 @@ jobs:
2424
./tools/install_ros_deps.sh
2525
source /opt/ros/*/setup.bash
2626
cd ros
27-
catkin build -DCMAKE_C_COMPILER=gcc-8 -DCMAKE_CXX_COMPILER=g++-8
27+
catkin build -DCMAKE_C_COMPILER=gcc-12 -DCMAKE_CXX_COMPILER=g++-12
2828
2929
- name: Build ROS2 Wrapper
30-
if: matrix.os == 'ubuntu-20.04'
30+
if: matrix.os == 'ubuntu-22.04'
3131
run: |
3232
chmod +x ./tools/install_ros2_deps.sh
3333
./tools/install_ros2_deps.sh
3434
source /opt/ros/*/setup.bash
3535
cd ros2
36-
colcon build --cmake-args -DCMAKE_C_COMPILER=gcc-8 --cmake-args -DCMAKE_CXX_COMPILER=g++-8
36+
colcon build --cmake-args -DCMAKE_C_COMPILER=gcc-12 --cmake-args -DCMAKE_CXX_COMPILER=g++-12
3737
3838
# Removing support for GazeboDrone. Gazebo is dead. Long live AirSim/Colosseum.
3939
# - name: Build GazeboDrone

0 commit comments

Comments
 (0)