From a880cef2f4b7d33aecb69b6f8b9d681846cb4b8a Mon Sep 17 00:00:00 2001 From: Yutaka Kondo Date: Tue, 13 Aug 2024 16:24:34 +0900 Subject: [PATCH 1/2] install ament_cmake from official ros packages Signed-off-by: Yutaka Kondo --- autoware.repos | 4 ---- 1 file changed, 4 deletions(-) diff --git a/autoware.repos b/autoware.repos index 32d11ffd5d6..4d3fd640a77 100644 --- a/autoware.repos +++ b/autoware.repos @@ -78,10 +78,6 @@ repositories: type: git url: https://github.com/MapIV/llh_converter.git version: ros2 - universe/external/ament_cmake: # TODO(mitsudome-r): remove when https://github.com/ament/ament_cmake/pull/448 is merged - type: git - url: https://github.com/autowarefoundation/ament_cmake.git - version: feat/faster_ament_libraries_deduplicate universe/external/glog: # TODO(Horibe): to use isGoogleInitialized() API in v0.6.0. Remove when the rosdep glog version is updated to v0.6.0 (already updated in Ubuntu 24.04) type: git url: https://github.com/tier4/glog.git From cd397cf3956614e060bfcee8c0aec853fbea8ade Mon Sep 17 00:00:00 2001 From: Yutaka Kondo Date: Wed, 14 Aug 2024 11:52:26 +0900 Subject: [PATCH 2/2] disable ccache Signed-off-by: Yutaka Kondo --- .github/actions/docker-build/action.yaml | 26 +----------------------- 1 file changed, 1 insertion(+), 25 deletions(-) diff --git a/.github/actions/docker-build/action.yaml b/.github/actions/docker-build/action.yaml index 1fec7b76005..c49d785360b 100644 --- a/.github/actions/docker-build/action.yaml +++ b/.github/actions/docker-build/action.yaml @@ -37,18 +37,6 @@ runs: vcs import src < autoware.repos shell: bash - - name: Cache ccache - uses: actions/cache@v4 - if: ${{ inputs.name == 'no-cuda' && github.ref == 'refs/heads/main' }} - id: cache-ccache - with: - path: | - root-ccache - key: ccache-${{ inputs.platform }}-${{ inputs.name }}-${{ hashFiles('src/**/*.cpp') }} - restore-keys: | - ccache-${{ inputs.platform }}-${{ inputs.name }}- - ccache-${{ inputs.platform }}- - - name: Cache apt-get uses: actions/cache@v4 if: ${{ inputs.name == 'no-cuda' && github.ref == 'refs/heads/main' }} @@ -61,17 +49,6 @@ runs: apt-get-${{ inputs.platform }}-${{ inputs.name }}- apt-get-${{ inputs.platform }}- - - name: Restore ccache - uses: actions/cache/restore@v4 - if: ${{ inputs.name != 'no-cuda' || github.ref != 'refs/heads/main' }} - with: - path: | - root-ccache - key: ccache-${{ inputs.platform }}-${{ inputs.name }}-${{ hashFiles('src/**/*.cpp') }} - restore-keys: | - ccache-${{ inputs.platform }}-${{ inputs.name }}- - ccache-${{ inputs.platform }}- - - name: Restore apt-get uses: actions/cache/restore@v4 if: ${{ inputs.name != 'no-cuda' || github.ref != 'refs/heads/main' }} @@ -88,10 +65,9 @@ runs: with: cache-map: | { - "root-ccache": "/root/.ccache", "var-cache-apt": "/var/cache/apt" } - skip-extraction: ${{ steps.cache-ccache.outputs.cache-hit && steps.cache-apt-get.outputs.cache-hit }} + skip-extraction: ${{ steps.cache-apt-get.outputs.cache-hit }} - name: Login to Docker Hub uses: docker/login-action@v3