From 9e26a1317d00efe0ca37437575846a570dfcef90 Mon Sep 17 00:00:00 2001 From: Kotaro Yoshimoto Date: Wed, 16 Oct 2024 12:46:11 +0000 Subject: [PATCH] =?UTF-8?q?=E3=83=AA=E3=83=AA=E3=83=BC=E3=82=B9=E3=83=93?= =?UTF-8?q?=E3=83=AB=E3=83=89=E3=82=84=E3=82=81=E3=82=84=E3=82=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/build_test.yaml | 1 - .github/workflows/full_build.yaml | 2 +- docker/ccache/Dockerfile | 2 +- docker/prebuilt/Dockerfile | 2 +- docker/scenario/Dockerfile | 2 +- 5 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build_test.yaml b/.github/workflows/build_test.yaml index 19b846b6a..eafa46a8d 100644 --- a/.github/workflows/build_test.yaml +++ b/.github/workflows/build_test.yaml @@ -77,7 +77,6 @@ jobs: . /opt/ros/${{ matrix.rosdistro }}/setup.sh colcon build --event-handlers console_cohesion+ \ --packages-above-and-dependencies ${{ steps.get-modified-packages.outputs.modified-packages }} \ - --cmake-args -DCMAKE_BUILD_TYPE=Release \ --mixin coverage-gcc coverage-pytest compile-commands shell: bash diff --git a/.github/workflows/full_build.yaml b/.github/workflows/full_build.yaml index 48e0ad2a6..de2236656 100644 --- a/.github/workflows/full_build.yaml +++ b/.github/workflows/full_build.yaml @@ -59,7 +59,7 @@ jobs: - name: Build run: | . /opt/ros/${{ matrix.rosdistro }}/setup.sh - colcon build --symlink-install --cmake-args -DCMAKE_BUILD_TYPE=Release + colcon build --symlink-install shell: bash - name: Test diff --git a/docker/ccache/Dockerfile b/docker/ccache/Dockerfile index 93375bc3a..738417708 100644 --- a/docker/ccache/Dockerfile +++ b/docker/ccache/Dockerfile @@ -23,7 +23,7 @@ RUN ccache -sv RUN cd .. && \ source /opt/ros/humble/setup.bash && \ - colcon build --symlink-install --cmake-args '-DCMAKE_BUILD_TYPE=Release' + colcon build --symlink-install RUN cd .. && rm -rf build/ src/ install/ log/ && mkdir src diff --git a/docker/prebuilt/Dockerfile b/docker/prebuilt/Dockerfile index ed95cc86a..488474b60 100644 --- a/docker/prebuilt/Dockerfile +++ b/docker/prebuilt/Dockerfile @@ -14,6 +14,6 @@ RUN rosdep update && \ RUN cd .. && \ source /opt/ros/humble/setup.bash && \ - colcon build --symlink-install --cmake-args '-DCMAKE_BUILD_TYPE=Release' + colcon build --symlink-install RUN cd .. && rm -rf src/ && mkdir src diff --git a/docker/scenario/Dockerfile b/docker/scenario/Dockerfile index 4f1372c89..991ee8653 100644 --- a/docker/scenario/Dockerfile +++ b/docker/scenario/Dockerfile @@ -15,4 +15,4 @@ RUN rosdep update && \ RUN cd .. && \ source /opt/ros/humble/setup.bash && \ - colcon build --symlink-install --cmake-args '-DCMAKE_BUILD_TYPE=Release' + colcon build --symlink-install