From d41c9a4b09f6ddffb66e1b57ef578a575e10ea19 Mon Sep 17 00:00:00 2001 From: Tomoyuki Sakurai Date: Mon, 4 Nov 2024 08:24:52 +0700 Subject: [PATCH 1/4] ci: update image_url for build to 1.0.23 --- .github/workflows/poudriere.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/poudriere.yml b/.github/workflows/poudriere.yml index ea0536d..3ccb53e 100644 --- a/.github/workflows/poudriere.yml +++ b/.github/workflows/poudriere.yml @@ -155,7 +155,7 @@ jobs: with: operating_system: freebsd version: '14.1' - image_url: https://github.com/trombik/freebsd-builder-poudriere/releases/download/v1.0.7/freebsd-14.1-x86-64.qcow2 + image_url: https://github.com/trombik/freebsd-builder-poudriere/releases/download/v1.0.23/freebsd-14.1-x86-64.qcow2 sync_files: true run: | set -x From c48e931be7fc353bd93e181471fcae245d175ad9 Mon Sep 17 00:00:00 2001 From: Tomoyuki Sakurai Date: Mon, 4 Nov 2024 13:21:21 +0700 Subject: [PATCH 2/4] ci: add rust to ALLOW_MAKE_JOBS_PACKAGES --- .github/workflows/poudriere.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/poudriere.yml b/.github/workflows/poudriere.yml index 3ccb53e..0151630 100644 --- a/.github/workflows/poudriere.yml +++ b/.github/workflows/poudriere.yml @@ -200,7 +200,7 @@ jobs: # packages and ccache cache might help future builds. # allow MAX_JOBS in ports which take longer to build - echo ALLOW_MAKE_JOBS_PACKAGES="\"cmake-core-* esp-llvm-embedded-toolchain-* rust-esp-* xtensa-esp32-elf-* xtensa-esp-elf-* riscv32-esp-elf-*\"" | sudo tee -a /usr/local/etc/poudriere.conf + echo ALLOW_MAKE_JOBS_PACKAGES="\"rust rust-nightly cmake-core-* esp-llvm-embedded-toolchain-* rust-esp* xtensa-esp32-elf-* xtensa-esp-elf-* riscv32-esp-elf-*\"" | sudo tee -a /usr/local/etc/poudriere.conf # disable a logic to find out build failure. takes too much time # and disk space From 7bb5f084cc0e2f16418e3c9ed60c3ad92ce12470 Mon Sep 17 00:00:00 2001 From: Tomoyuki Sakurai Date: Mon, 4 Nov 2024 15:54:49 +0700 Subject: [PATCH 3/4] ci: always upload packages the comment is no longer true --- .github/workflows/poudriere.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/poudriere.yml b/.github/workflows/poudriere.yml index 0151630..646451e 100644 --- a/.github/workflows/poudriere.yml +++ b/.github/workflows/poudriere.yml @@ -329,10 +329,7 @@ jobs: - name: upload packages id: packages-upload-step - - # if the outcome is failure `packages` directory contains compressed - # zip files. do not upload them. - if: ${{ steps.download-packages.outcome == 'success' }} && ( success() || failure() ) + if: success() || failure() uses: actions/upload-artifact@v4 with: name: packages-${{ env.SAFE_PORT_NAME }} From be8b7daf25b00d64c1c2a6f670312725f268f0bc Mon Sep 17 00:00:00 2001 From: Tomoyuki Sakurai Date: Mon, 4 Nov 2024 22:37:52 +0700 Subject: [PATCH 4/4] ci: overwrite artifacts --- .github/workflows/poudriere.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/poudriere.yml b/.github/workflows/poudriere.yml index 646451e..e6ecd92 100644 --- a/.github/workflows/poudriere.yml +++ b/.github/workflows/poudriere.yml @@ -318,6 +318,9 @@ jobs: name: logs-${{ env.SAFE_PORT_NAME }} path: logs/ + # overwrite artifact if exists. this enables failed job to run again + overwrite: true + - name: rename packages.built to packages if: success() || failure() shell: sh @@ -334,6 +337,7 @@ jobs: with: name: packages-${{ env.SAFE_PORT_NAME }} path: packages/ + overwrite: true - name: upload ccache cache if: success() || failure() @@ -341,3 +345,4 @@ jobs: with: name: ccache-${{ env.SAFE_PORT_NAME }} path: ccache + overwrite: true