From 3db839ace68dcfae521d61d9fb8586421365c6bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=2E=20Fatih=20C=C4=B1r=C4=B1t?= Date: Wed, 6 Mar 2024 17:33:37 +0300 Subject: [PATCH 1/4] ci: update build-and-test and -differential jobs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: oguzkaganozt Signed-off-by: M. Fatih Cırıt --- ...test-self-hosted.yaml => build-and-test-arm64.yaml} | 6 +++--- ...ted.yaml => build-and-test-differential-arm64.yaml} | 6 +++--- .github/workflows/build-and-test-differential.yaml | 8 ++++---- .github/workflows/build-and-test.yaml | 10 ++++++++-- 4 files changed, 18 insertions(+), 12 deletions(-) rename .github/workflows/{build-and-test-self-hosted.yaml => build-and-test-arm64.yaml} (91%) rename .github/workflows/{build-and-test-differential-self-hosted.yaml => build-and-test-differential-arm64.yaml} (91%) diff --git a/.github/workflows/build-and-test-self-hosted.yaml b/.github/workflows/build-and-test-arm64.yaml similarity index 91% rename from .github/workflows/build-and-test-self-hosted.yaml rename to .github/workflows/build-and-test-arm64.yaml index 9f351a5dc75ec..db5bb5965c538 100644 --- a/.github/workflows/build-and-test-self-hosted.yaml +++ b/.github/workflows/build-and-test-arm64.yaml @@ -1,4 +1,4 @@ -name: build-and-test-self-hosted +name: build-and-test-arm64 on: schedule: @@ -6,7 +6,7 @@ on: workflow_dispatch: jobs: - build-and-test-self-hosted: + build-and-test-arm64: runs-on: [self-hosted, linux, ARM64] container: ${{ matrix.container }}${{ matrix.container-suffix }} strategy: @@ -19,7 +19,7 @@ jobs: - -cuda include: - rosdistro: humble - container: ghcr.io/autowarefoundation/autoware-universe:humble-latest + container: ghcr.io/autowarefoundation/autoware-openadk:latest-prebuilt build-depends-repos: build_depends.repos steps: - name: Check out repository diff --git a/.github/workflows/build-and-test-differential-self-hosted.yaml b/.github/workflows/build-and-test-differential-arm64.yaml similarity index 91% rename from .github/workflows/build-and-test-differential-self-hosted.yaml rename to .github/workflows/build-and-test-differential-arm64.yaml index 86d3011cf3208..3713f7d8f5a5f 100644 --- a/.github/workflows/build-and-test-differential-self-hosted.yaml +++ b/.github/workflows/build-and-test-differential-arm64.yaml @@ -1,4 +1,4 @@ -name: build-and-test-differential-self-hosted +name: build-and-test-differential-arm64 on: pull_request: @@ -14,7 +14,7 @@ jobs: with: label: ARM64 - build-and-test-differential-self-hosted: + build-and-test-differential-arm64: needs: prevent-no-label-execution if: ${{ needs.prevent-no-label-execution.outputs.run == 'true' }} runs-on: [self-hosted, linux, ARM64] @@ -29,7 +29,7 @@ jobs: - -cuda include: - rosdistro: humble - container: ghcr.io/autowarefoundation/autoware-universe:humble-latest + container: ghcr.io/autowarefoundation/autoware-openadk:latest-prebuilt build-depends-repos: build_depends.repos steps: - name: Check out repository diff --git a/.github/workflows/build-and-test-differential.yaml b/.github/workflows/build-and-test-differential.yaml index e4231a12a6add..48400cef8feeb 100644 --- a/.github/workflows/build-and-test-differential.yaml +++ b/.github/workflows/build-and-test-differential.yaml @@ -16,7 +16,7 @@ jobs: build-and-test-differential: needs: prevent-no-label-execution if: ${{ needs.prevent-no-label-execution.outputs.run == 'true' }} - runs-on: [self-hosted, linux, X64] + runs-on: ubuntu-latest container: ${{ matrix.container }}${{ matrix.container-suffix }} strategy: fail-fast: false @@ -27,7 +27,7 @@ jobs: - -cuda include: - rosdistro: humble - container: ghcr.io/autowarefoundation/autoware-universe:humble-latest + container: ghcr.io/autowarefoundation/autoware-openadk:latest-prebuilt build-depends-repos: build_depends.repos steps: - name: Check out repository @@ -35,7 +35,7 @@ jobs: with: fetch-depth: 0 - - name: Check disk space before build + - name: Show disk space before the tasks run: df -h - name: Remove exec_depend @@ -71,5 +71,5 @@ jobs: verbose: true flags: differential - - name: Check disk space after build + - name: Show disk space after the tasks run: df -h diff --git a/.github/workflows/build-and-test.yaml b/.github/workflows/build-and-test.yaml index a6eea766cd80d..49e1c979928ad 100644 --- a/.github/workflows/build-and-test.yaml +++ b/.github/workflows/build-and-test.yaml @@ -9,7 +9,7 @@ on: jobs: build-and-test: if: ${{ github.event_name != 'push' || github.ref_name == github.event.repository.default_branch }} - runs-on: [self-hosted, linux, X64] + runs-on: ubuntu-latest container: ${{ matrix.container }}${{ matrix.container-suffix }} strategy: fail-fast: false @@ -21,12 +21,15 @@ jobs: - -cuda include: - rosdistro: humble - container: ghcr.io/autowarefoundation/autoware-universe:humble-latest + container: ghcr.io/autowarefoundation/autoware-openadk:latest-prebuilt build-depends-repos: build_depends.repos steps: - name: Check out repository uses: actions/checkout@v3 + - name: Show disk space before the tasks + run: df -h + - name: Remove exec_depend uses: autowarefoundation/autoware-github-actions/remove-exec-depend@v1 @@ -59,3 +62,6 @@ jobs: fail_ci_if_error: false verbose: true flags: total + + - name: Show disk space after the tasks + run: df -h From 73f6afa7836499553f0cb012a742efe4b3359685 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=2E=20Fatih=20C=C4=B1r=C4=B1t?= Date: Wed, 6 Mar 2024 17:40:15 +0300 Subject: [PATCH 2/4] bring back non-cuda job MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: M. Fatih Cırıt --- .github/workflows/build-and-test-differential.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build-and-test-differential.yaml b/.github/workflows/build-and-test-differential.yaml index 48400cef8feeb..91c2daee6ebdf 100644 --- a/.github/workflows/build-and-test-differential.yaml +++ b/.github/workflows/build-and-test-differential.yaml @@ -24,6 +24,7 @@ jobs: rosdistro: - humble container-suffix: + - "" - -cuda include: - rosdistro: humble From bd4d25864353497d8b41b136e3ac48be87a3fddd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=2E=20Fatih=20C=C4=B1r=C4=B1t?= Date: Wed, 6 Mar 2024 17:45:44 +0300 Subject: [PATCH 3/4] fix arm tag MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: M. Fatih Cırıt --- .github/workflows/build-and-test-differential-arm64.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-and-test-differential-arm64.yaml b/.github/workflows/build-and-test-differential-arm64.yaml index 3713f7d8f5a5f..ea709f8e98e26 100644 --- a/.github/workflows/build-and-test-differential-arm64.yaml +++ b/.github/workflows/build-and-test-differential-arm64.yaml @@ -12,7 +12,7 @@ jobs: prevent-no-label-execution: uses: autowarefoundation/autoware-github-actions/.github/workflows/prevent-no-label-execution.yaml@v1 with: - label: ARM64 + label: type:arm64 build-and-test-differential-arm64: needs: prevent-no-label-execution From 122703a40e4cf5d1259dd4e78ce8385b24256023 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=2E=20Fatih=20C=C4=B1r=C4=B1t?= Date: Wed, 6 Mar 2024 17:55:00 +0300 Subject: [PATCH 4/4] show disk space for arm workflows MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: M. Fatih Cırıt --- .github/workflows/build-and-test-arm64.yaml | 6 ++++++ .github/workflows/build-and-test-differential-arm64.yaml | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/.github/workflows/build-and-test-arm64.yaml b/.github/workflows/build-and-test-arm64.yaml index db5bb5965c538..932c15d27b05f 100644 --- a/.github/workflows/build-and-test-arm64.yaml +++ b/.github/workflows/build-and-test-arm64.yaml @@ -25,6 +25,9 @@ jobs: - name: Check out repository uses: actions/checkout@v3 + - name: Show disk space before the tasks + run: df -h + - name: Remove exec_depend uses: autowarefoundation/autoware-github-actions/remove-exec-depend@v1 @@ -47,3 +50,6 @@ jobs: rosdistro: ${{ matrix.rosdistro }} target-packages: ${{ steps.get-self-packages.outputs.self-packages }} build-depends-repos: ${{ matrix.build-depends-repos }} + + - name: Show disk space after the tasks + run: df -h diff --git a/.github/workflows/build-and-test-differential-arm64.yaml b/.github/workflows/build-and-test-differential-arm64.yaml index ea709f8e98e26..f742dedcf0b89 100644 --- a/.github/workflows/build-and-test-differential-arm64.yaml +++ b/.github/workflows/build-and-test-differential-arm64.yaml @@ -37,6 +37,9 @@ jobs: with: fetch-depth: 0 + - name: Show disk space before the tasks + run: df -h + - name: Remove exec_depend uses: autowarefoundation/autoware-github-actions/remove-exec-depend@v1 @@ -59,3 +62,6 @@ jobs: rosdistro: ${{ matrix.rosdistro }} target-packages: ${{ steps.get-modified-packages.outputs.modified-packages }} build-depends-repos: ${{ matrix.build-depends-repos }} + + - name: Show disk space after the tasks + run: df -h