From 9b0b7f2c8c9c74d361d45d19e26f7fe8de8c51cb Mon Sep 17 00:00:00 2001 From: Yutaka Kondo Date: Mon, 25 Nov 2024 16:13:34 +0900 Subject: [PATCH 1/3] copy cleanup_system.sh Signed-off-by: Yutaka Kondo --- docker/Dockerfile.base | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docker/Dockerfile.base b/docker/Dockerfile.base index dca6fb8a0f..516870c7bb 100644 --- a/docker/Dockerfile.base +++ b/docker/Dockerfile.base @@ -10,6 +10,8 @@ COPY setup-dev-env.sh ansible-galaxy-requirements.yaml amd64.env arm64.env /auto COPY ansible/ /autoware/ansible/ COPY docker/scripts/cleanup_apt.sh /autoware/cleanup_apt.sh RUN chmod +x /autoware/cleanup_apt.sh +COPY docker/scripts/cleanup_system.sh /autoware/cleanup_system.sh +RUN chmod +x /autoware/cleanup_system.sh WORKDIR /autoware # Install apt packages and add GitHub to known hosts for private repositories From 491cb9da7742db90942b3a6dc7e9e73a5c23ac33 Mon Sep 17 00:00:00 2001 From: Yutaka Kondo Date: Tue, 26 Nov 2024 11:09:13 +0900 Subject: [PATCH 2/3] separate jobs Signed-off-by: Yutaka Kondo --- .github/workflows/autoware-base.yaml | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/.github/workflows/autoware-base.yaml b/.github/workflows/autoware-base.yaml index c4ec32e189..22c95c2a36 100644 --- a/.github/workflows/autoware-base.yaml +++ b/.github/workflows/autoware-base.yaml @@ -9,9 +9,25 @@ jobs: load-env: uses: ./.github/workflows/load-env.yaml - docker-build-and-push-base: + autoware-base-amd64: needs: load-env runs-on: ubuntu-22.04 + steps: + - name: Check out this repository + uses: actions/checkout@v4 + + - name: Build Autoware's base images + uses: ./.github/actions/docker-build-and-push-base + with: + target-image: autoware-base + build-args: | + *.platform=linux/amd64 + *.args.ROS_DISTRO=${{ needs.load-env.outputs.rosdistro }} + *.args.BASE_IMAGE=${{ needs.load-env.outputs.base_image }} + + autoware-base-arm64: + needs: [load-env, autoware-base-amd64] + runs-on: ubuntu-22.04 steps: - name: Check out this repository uses: actions/checkout@v4 @@ -24,6 +40,6 @@ jobs: with: target-image: autoware-base build-args: | - *.platform=linux/amd64,linux/arm64 + *.platform=linux/arm64 *.args.ROS_DISTRO=${{ needs.load-env.outputs.rosdistro }} *.args.BASE_IMAGE=${{ needs.load-env.outputs.base_image }} From 73bc7eea37d865c599fb6fbc52b12b6850d337e7 Mon Sep 17 00:00:00 2001 From: Yutaka Kondo Date: Tue, 26 Nov 2024 11:56:28 +0900 Subject: [PATCH 3/3] free disk space Signed-off-by: Yutaka Kondo --- .github/workflows/autoware-base.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/autoware-base.yaml b/.github/workflows/autoware-base.yaml index 22c95c2a36..e3d9720bcc 100644 --- a/.github/workflows/autoware-base.yaml +++ b/.github/workflows/autoware-base.yaml @@ -16,6 +16,9 @@ jobs: - name: Check out this repository uses: actions/checkout@v4 + - name: Free disk space + uses: ./.github/actions/free-disk-space + - name: Build Autoware's base images uses: ./.github/actions/docker-build-and-push-base with: @@ -32,6 +35,9 @@ jobs: - name: Check out this repository uses: actions/checkout@v4 + - name: Free disk space + uses: ./.github/actions/free-disk-space + - name: Set up QEMU uses: docker/setup-qemu-action@v3