diff --git a/.github/workflows/ubuntu_20_04.yml b/.github/workflows/ubuntu_20_04.yml index c428b8a..7010f01 100644 --- a/.github/workflows/ubuntu_20_04.yml +++ b/.github/workflows/ubuntu_20_04.yml @@ -36,6 +36,11 @@ jobs: cd staging underlay_ws/build.sh + - name: local catkin build + run: | + cd staging + underlay_ws/catkin.sh + - name: docker build from source 20.04 run: | cd ros_from_src diff --git a/.github/workflows/ubuntu_24_04.yaml b/.github/workflows/ubuntu_24_04.yaml index 312a256..8f602fe 100644 --- a/.github/workflows/ubuntu_24_04.yaml +++ b/.github/workflows/ubuntu_24_04.yaml @@ -15,6 +15,32 @@ jobs: path: ros_from_src submodules: recursive + - name: local apt dependencies + run: | + mkdir staging + cd staging + mkdir -p underlay_ws/src + cp ../ros_from_src/*sh underlay_ws + sudo underlay_ws/dependencies.sh + pip install vcstool + + - name: local git dependencies + run: | + cd staging + cp ../ros_from_src/*yaml underlay_ws/src + # override rosconsole in 20.04 for log4cxx compatibility + ROSCONSOLE=https://github.com/ros/rosconsole underlay_ws/git_clone.sh + + - name: local build + run: | + cd staging + underlay_ws/build.sh + + - name: local catkin build + run: | + cd staging + underlay_ws/catkin.sh + - name: docker build from source 24.04 run: | cd ros_from_src