From f966455d0a75eb942aa45d69cabd8155706c4364 Mon Sep 17 00:00:00 2001 From: Levi Armstrong Date: Thu, 28 Jul 2022 09:55:30 -0500 Subject: [PATCH] Update clang-tidy, codecove, nightly CI to use master docker --- .github/workflows/clang_tidy.yml | 2 +- .github/workflows/codecov.yml | 2 +- .github/workflows/nightly.yml | 4 ++-- .github/workflows/unstable_build.yml | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/clang_tidy.yml b/.github/workflows/clang_tidy.yml index 3a9a27a7112..bb6c57397a3 100644 --- a/.github/workflows/clang_tidy.yml +++ b/.github/workflows/clang_tidy.yml @@ -58,7 +58,7 @@ jobs: env: OS_NAME: ubuntu OS_CODE_NAME: focal - DOCKER_IMAGE: ${{ env.REGISTRY }}/tesseract-robotics/tesseract:${{ env.ROS_DISTRO }}-0.13 + DOCKER_IMAGE: ${{ env.REGISTRY }}/tesseract-robotics/tesseract:${{ env.ROS_DISTRO }}-master CCACHE_DIR: ${{ github.workspace }}/${{ env.CI_NAME }}/.ccache ROS_REPO: main UNDERLAY: /root//tesseract-robotics/tesseract_target_ws/install diff --git a/.github/workflows/codecov.yml b/.github/workflows/codecov.yml index a05e3d19e0d..614b4e173e8 100644 --- a/.github/workflows/codecov.yml +++ b/.github/workflows/codecov.yml @@ -59,7 +59,7 @@ jobs: env: OS_NAME: ubuntu OS_CODE_NAME: focal - DOCKER_IMAGE: ${{ env.REGISTRY }}/tesseract-robotics/tesseract:${{ env.ROS_DISTRO }}-0.13 + DOCKER_IMAGE: ${{ env.REGISTRY }}/tesseract-robotics/tesseract:${{ env.ROS_DISTRO }}-master ROS_REPO: main UNDERLAY: /root//tesseract-robotics/tesseract_target_ws/install PREFIX: ${{ github.repository }}_ diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 0c40c01b7a3..33a2bca5fc2 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -29,12 +29,12 @@ jobs: - {CI_NAME: Bionic-Build-Nightly, OS_CODE_NAME: bionic, ROS_DISTRO: melodic, - DOCKER_IMAGE: "ghcr.io/tesseract-robotics/tesseract:melodic-0.13", + DOCKER_IMAGE: "ghcr.io/tesseract-robotics/tesseract:melodic-master", CCACHE_DIR: "${{ github.workspace }}/Bionic-Build-Nightly/.ccache"} - {CI_NAME: Focal-Build-Nightly, OS_CODE_NAME: focal, ROS_DISTRO: noetic, - DOCKER_IMAGE: "ghcr.io/tesseract-robotics/tesseract:noetic-0.13", + DOCKER_IMAGE: "ghcr.io/tesseract-robotics/tesseract:noetic-master", CCACHE_DIR: "${{ github.workspace }}/Focal-Build-Nightly/.ccache"} steps: diff --git a/.github/workflows/unstable_build.yml b/.github/workflows/unstable_build.yml index c43ff1908de..8541406e52b 100644 --- a/.github/workflows/unstable_build.yml +++ b/.github/workflows/unstable_build.yml @@ -68,7 +68,7 @@ jobs: UPSTREAM_WORKSPACE: dependencies.rosinstall UPSTREAM_CMAKE_ARGS: "-DCMAKE_BUILD_TYPE=Release" ROSDEP_SKIP_KEYS: "bullet fcl ompl orocos_kdl python-numpy ifopt python descartes_opw descartes_samplers descartes_light opw_kinematics ros_industrial_cmake_boilerplate iwyu taskflow" - TARGET_CMAKE_ARGS: "-DCMAKE_BUILD_TYPE=Debug -DTESSERACT_ENABLE_TESTING=ON -DTESSERACT_ENABLE_CLANG_TIDY=ON" + TARGET_CMAKE_ARGS: "-DCMAKE_BUILD_TYPE=Debug -DTESSERACT_ENABLE_TESTING=ON" NOT_TEST_BUILD: true BEFORE_RUN_TARGET_TEST_EMBED: "ici_with_unset_variables source $BASEDIR/${PREFIX}target_ws/install/setup.bash" AFTER_SCRIPT: 'catkin build -w $target_ws --verbose --make-args test'