From 8e768ef844ce93c23fdbfd5a4d1f4a789a27f3e0 Mon Sep 17 00:00:00 2001 From: Yutaka Kondo Date: Fri, 7 Mar 2025 20:29:11 +0900 Subject: [PATCH 1/2] use core-common-devel instead Signed-off-by: Yutaka Kondo --- .github/workflows/build-and-test-daily.yaml | 2 +- .github/workflows/build-and-test-differential.yaml | 4 ++-- .github/workflows/build-and-test.yaml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-and-test-daily.yaml b/.github/workflows/build-and-test-daily.yaml index 6fdd27c0f6..5b6b6b1da2 100644 --- a/.github/workflows/build-and-test-daily.yaml +++ b/.github/workflows/build-and-test-daily.yaml @@ -8,7 +8,7 @@ on: jobs: build-and-test-daily: runs-on: ubuntu-24.04 - container: ghcr.io/autowarefoundation/autoware:core-devel + container: ghcr.io/autowarefoundation/autoware:core-common-devel steps: - name: Check out repository uses: actions/checkout@v4 diff --git a/.github/workflows/build-and-test-differential.yaml b/.github/workflows/build-and-test-differential.yaml index 3392fb502e..cb18f22495 100644 --- a/.github/workflows/build-and-test-differential.yaml +++ b/.github/workflows/build-and-test-differential.yaml @@ -26,7 +26,7 @@ jobs: needs: require-label if: ${{ needs.require-label.outputs.result == 'true' }} runs-on: ubuntu-24.04 - container: ghcr.io/autowarefoundation/autoware:core-devel + container: ghcr.io/autowarefoundation/autoware:core-common-devel steps: - name: Set PR fetch depth run: echo "PR_FETCH_DEPTH=$(( ${{ github.event.pull_request.commits }} + 1 ))" >> "${GITHUB_ENV}" @@ -48,7 +48,7 @@ jobs: clang-tidy-differential: needs: build-and-test-differential runs-on: ubuntu-24.04 - container: ghcr.io/autowarefoundation/autoware:core-devel + container: ghcr.io/autowarefoundation/autoware:core-common-devel steps: - name: Set PR fetch depth run: echo "PR_FETCH_DEPTH=$(( ${{ github.event.pull_request.commits }} + 1 ))" >> "${GITHUB_ENV}" diff --git a/.github/workflows/build-and-test.yaml b/.github/workflows/build-and-test.yaml index 3e7a734c4f..ef7db0a262 100644 --- a/.github/workflows/build-and-test.yaml +++ b/.github/workflows/build-and-test.yaml @@ -17,7 +17,7 @@ env: jobs: build-and-test: runs-on: ubuntu-24.04 - container: ghcr.io/autowarefoundation/autoware:core-devel + container: ghcr.io/autowarefoundation/autoware:core-common-devel steps: - name: Check out repository uses: actions/checkout@v4 From 293f042046239818f4c9e1a97de39b89fb65d52c Mon Sep 17 00:00:00 2001 From: Yutaka Kondo Date: Mon, 10 Mar 2025 21:28:50 +0900 Subject: [PATCH 2/2] add underlay-workspace arg Signed-off-by: Yutaka Kondo --- .github/actions/build-and-test-differential/action.yaml | 1 + .github/workflows/build-and-test-daily.yaml | 1 + .github/workflows/build-and-test-differential-self-hosted.yaml | 1 + .github/workflows/build-and-test-self-hosted.yaml | 1 + .github/workflows/build-and-test.yaml | 1 + .github/workflows/check-build-depends.yaml | 1 + 6 files changed, 6 insertions(+) diff --git a/.github/actions/build-and-test-differential/action.yaml b/.github/actions/build-and-test-differential/action.yaml index 175e71c482..e41731f83f 100644 --- a/.github/actions/build-and-test-differential/action.yaml +++ b/.github/actions/build-and-test-differential/action.yaml @@ -65,6 +65,7 @@ runs: target-packages: ${{ steps.get-modified-packages.outputs.modified-packages }} build-depends-repos: ${{ inputs.build-depends-repos }} build-pre-command: ${{ inputs.build-pre-command }} + underlay-workspace: /opt/autoware - name: Show ccache stats after build run: du -sh ${CCACHE_DIR} && ccache -s diff --git a/.github/workflows/build-and-test-daily.yaml b/.github/workflows/build-and-test-daily.yaml index 5b6b6b1da2..fd13c819d7 100644 --- a/.github/workflows/build-and-test-daily.yaml +++ b/.github/workflows/build-and-test-daily.yaml @@ -32,6 +32,7 @@ jobs: rosdistro: humble target-packages: ${{ steps.get-self-packages.outputs.self-packages }} build-depends-repos: build_depends.repos + underlay-workspace: /opt/autoware - name: Test if: ${{ steps.get-self-packages.outputs.self-packages != '' }} diff --git a/.github/workflows/build-and-test-differential-self-hosted.yaml b/.github/workflows/build-and-test-differential-self-hosted.yaml index ae7aeca495..0186034d2f 100644 --- a/.github/workflows/build-and-test-differential-self-hosted.yaml +++ b/.github/workflows/build-and-test-differential-self-hosted.yaml @@ -48,6 +48,7 @@ jobs: rosdistro: ${{ matrix.rosdistro }} target-packages: ${{ steps.get-modified-packages.outputs.modified-packages }} build-depends-repos: ${{ matrix.build-depends-repos }} + underlay-workspace: /opt/autoware - name: Test if: ${{ steps.get-modified-packages.outputs.modified-packages != '' }} diff --git a/.github/workflows/build-and-test-self-hosted.yaml b/.github/workflows/build-and-test-self-hosted.yaml index 0a3c2c22ed..b3090f55c3 100644 --- a/.github/workflows/build-and-test-self-hosted.yaml +++ b/.github/workflows/build-and-test-self-hosted.yaml @@ -36,6 +36,7 @@ jobs: rosdistro: ${{ matrix.rosdistro }} target-packages: ${{ steps.get-self-packages.outputs.self-packages }} build-depends-repos: ${{ matrix.build-depends-repos }} + underlay-workspace: /opt/autoware - name: Test if: ${{ steps.get-self-packages.outputs.self-packages != '' }} diff --git a/.github/workflows/build-and-test.yaml b/.github/workflows/build-and-test.yaml index ef7db0a262..bc713687fc 100644 --- a/.github/workflows/build-and-test.yaml +++ b/.github/workflows/build-and-test.yaml @@ -72,6 +72,7 @@ jobs: target-packages: ${{ steps.get-self-packages.outputs.self-packages }} build-depends-repos: build_depends.repos build-pre-command: taskset --cpu-list 0-6 + underlay-workspace: /opt/autoware - name: Show ccache stats after build run: du -sh ${CCACHE_DIR} && ccache -s diff --git a/.github/workflows/check-build-depends.yaml b/.github/workflows/check-build-depends.yaml index bb1d89851d..390d0422cb 100644 --- a/.github/workflows/check-build-depends.yaml +++ b/.github/workflows/check-build-depends.yaml @@ -39,3 +39,4 @@ jobs: rosdistro: ${{ matrix.rosdistro }} target-packages: ${{ steps.get-self-packages.outputs.self-packages }} build-depends-repos: ${{ matrix.build-depends-repos }} + underlay-workspace: /opt/autoware