From 581707fb2905b8686d5ba22b0f9ada8c022db990 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=2E=20Fatih=20C=C4=B1r=C4=B1t?= Date: Tue, 20 Feb 2024 14:34:39 +0300 Subject: [PATCH] turn on build images MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: M. Fatih Cırıt --- .github/actions/free-disk-space/action.yaml | 7 +--- .github/workflows/build-main.yaml | 40 ++++++++++----------- 2 files changed, 21 insertions(+), 26 deletions(-) diff --git a/.github/actions/free-disk-space/action.yaml b/.github/actions/free-disk-space/action.yaml index 499deb75881..963b656313f 100644 --- a/.github/actions/free-disk-space/action.yaml +++ b/.github/actions/free-disk-space/action.yaml @@ -17,7 +17,7 @@ runs: with: # this might remove tools that are actually needed, # if set to "true" but frees about 6 GB - tool-cache: false + tool-cache: true # all of these default to true, but feel free to set to # "false" if necessary for your workflow @@ -27,8 +27,3 @@ runs: large-packages: true docker-images: true swap-storage: false - - - name: Show disk space - run: | - df -h - shell: bash diff --git a/.github/workflows/build-main.yaml b/.github/workflows/build-main.yaml index 6f593501bc1..0b55e94658e 100644 --- a/.github/workflows/build-main.yaml +++ b/.github/workflows/build-main.yaml @@ -30,26 +30,26 @@ jobs: - name: Free disk space uses: ./.github/actions/free-disk-space -# - name: Load env -# run: | -# cat amd64.env | sed -e "s/^\s*//" -e "/^#/d" >> $GITHUB_ENV -# if [ "$(uname -m)" = "aarch64" ]; then -# cat arm64.env | sed -e "s/^\s*//" -e "/^#/d" >> $GITHUB_ENV -# fi -# -# - name: Build 'autoware-universe' -# uses: ./.github/actions/docker-build-and-push -# with: -# bake-target: autoware-universe -# build-args: | -# *.platform=linux/amd64 -# *.args.ROS_DISTRO=${{ env.rosdistro }} -# *.args.BASE_IMAGE=${{ env[format('{0}', matrix.base_image_env)] }} -# *.args.PREBUILT_BASE_IMAGE=${{ env.prebuilt_base_image }} -# *.args.SETUP_ARGS=${{ matrix.setup-args }} -# tag-prefix: ${{ env.rosdistro }}- -# tag-suffix: ${{ matrix.additional-tag-suffix }}-amd64 -# allow-push: false + - name: Load env + run: | + cat amd64.env | sed -e "s/^\s*//" -e "/^#/d" >> $GITHUB_ENV + if [ "$(uname -m)" = "aarch64" ]; then + cat arm64.env | sed -e "s/^\s*//" -e "/^#/d" >> $GITHUB_ENV + fi + + - name: Build 'autoware-universe' + uses: ./.github/actions/docker-build-and-push + with: + bake-target: autoware-universe + build-args: | + *.platform=linux/amd64 + *.args.ROS_DISTRO=${{ env.rosdistro }} + *.args.BASE_IMAGE=${{ env[format('{0}', matrix.base_image_env)] }} + *.args.PREBUILT_BASE_IMAGE=${{ env.prebuilt_base_image }} + *.args.SETUP_ARGS=${{ matrix.setup-args }} + tag-prefix: ${{ env.rosdistro }}- + tag-suffix: ${{ matrix.additional-tag-suffix }}-amd64 + allow-push: false - name: Show disk space run: |