diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ba54cd39..2f236b72 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -5,6 +5,7 @@ on: push: branches: - develop + - develop-humble - master - "release/*" jobs: @@ -27,7 +28,7 @@ jobs: image: ${{ needs.determine_docker_org_and_tag.outputs.docker_organization }}/carma-base:${{ needs.determine_docker_org_and_tag.outputs.docker_image_tag }} env: INIT_ENV: "/home/carma/.base-image/init-env.sh" - ROS_2_ENV: "/opt/ros/foxy/setup.bash" + ROS_2_ENV: "/opt/ros/humble/setup.bash" TERM: xterm options: "--user root" steps: @@ -49,26 +50,6 @@ jobs: - name: Checkout dependencies run: | ./src/${{ github.event.repository.name }}/carma-messenger-core/docker/checkout.bash -r /opt/carma/ -b ${{ steps.determine-base-branch.outputs.git_branch }} - - name: Build Ros1 - run: | - source "$INIT_ENV" - PACKAGES=$(find . -maxdepth 2 -type f -name package.xml | sed 's/\.\///' | cut -d/ -f1) - sed -i '/colcon build/ s/$/ --parallel-workers 4 --packages-up-to $PACKAGES/' /home/carma/.ci-image/engineering_tools/code_coverage/make_with_coverage.bash - make_with_coverage.bash -m -e /opt/carma/ -o ./coverage_reports/gcov - - name: Run Ros1 C++ Tests - continue-on-error: true - run: | - source "$INIT_ENV" - sed -i '/colcon test/ s/$/ --parallel-workers 4 --packages-above $PACKAGES/' /home/carma/.ci-image/engineering_tools/code_coverage/make_with_coverage.bash - make_with_coverage.bash -t -e /opt/carma/ -o ./coverage_reports/gcov - - name: Backup ROS1 compile_commands.json - run: | - mv /opt/carma/build/compile_commands.json /opt/carma/compile_commands.ros1.json - - name: Cleanup before ROS 2 build - # Clear the build and install folders before building ROS 2 - run: | - rm -rf /opt/carma/install - rm -rf /opt/carma/build - name: Build Ros2 run: | source "$INIT_ENV" @@ -83,11 +64,6 @@ jobs: source "$ROS_2_ENV" sed -i '/colcon test/ s/$/ --parallel-workers 4 --packages-above $PACKAGES/' /home/carma/.ci-image/engineering_tools/code_coverage/make_with_coverage.bash make_with_coverage.bash -t -e /opt/carma/ -o ./coverage_reports/gcov - - name: Combine ROS1 and ROS2 compile_commands.json files - continue-on-error: true - run: | - mv /opt/carma/build/compile_commands.json /opt/carma/compile_commands.ros2.json - jq -s add /opt/carma/compile_commands.ros1.json /opt/carma/compile_commands.ros2.json > /opt/carma/build/compile_commands.json - name: Run SonarScanner uses: usdot-fhwa-stol/actions/sonar-scanner@main with: diff --git a/.github/workflows/dockerhub.yml b/.github/workflows/dockerhub.yml index 3eef0eae..891ea0ca 100644 --- a/.github/workflows/dockerhub.yml +++ b/.github/workflows/dockerhub.yml @@ -3,6 +3,7 @@ on: push: branches: - develop + - develop-humble - master - "release/*" tags: