From abab8c8939c91671fc917f09e1b32e3a576f4420 Mon Sep 17 00:00:00 2001 From: Gustavo Henrique Nihei Date: Tue, 17 May 2022 09:58:42 -0300 Subject: [PATCH 1/4] ci: Bump IDF Docker image revision to v4.4.1 release Signed-off-by: Gustavo Henrique Nihei --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c8fb49c..7a64ce3 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -15,7 +15,7 @@ jobs: steps: - uses: actions/checkout@v2 - name: Build IDF bootloader and partition table - uses: docker://docker.io/espressif/idf:v4.4 + uses: docker://docker.io/espressif/idf:v4.4.1 with: args: ./build_idfboot.sh -c ${{matrix.targets}} - uses: actions/upload-artifact@v2 From 8751d89feb4da0314d9c3f53c673bb6bb46188e3 Mon Sep 17 00:00:00 2001 From: Gustavo Henrique Nihei Date: Tue, 17 May 2022 09:59:57 -0300 Subject: [PATCH 2/4] esp-idf: Bump to include patches for allow bypassing MPU configuration Signed-off-by: Gustavo Henrique Nihei --- esp-idf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/esp-idf b/esp-idf index 8153bfe..81391f5 160000 --- a/esp-idf +++ b/esp-idf @@ -1 +1 @@ -Subproject commit 8153bfe4125e6a608abccf1561fd10285016c90a +Subproject commit 81391f57f62eca3fe10b12e6f24ce910925af84a From aabed6e377d62f9b7f6bb3c7e37b47023c4c8b77 Mon Sep 17 00:00:00 2001 From: Gustavo Henrique Nihei Date: Tue, 17 May 2022 10:54:20 -0300 Subject: [PATCH 3/4] ci: Bump revision of GitHub Actions scripts Signed-off-by: Gustavo Henrique Nihei --- .github/workflows/build.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7a64ce3..0353618 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -13,12 +13,12 @@ jobs: matrix: targets: [esp32, esp32s2, esp32s3, esp32c3] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Build IDF bootloader and partition table uses: docker://docker.io/espressif/idf:v4.4.1 with: args: ./build_idfboot.sh -c ${{matrix.targets}} - - uses: actions/upload-artifact@v2 + - uses: actions/upload-artifact@v3 with: name: idf-builds path: out/ @@ -29,12 +29,12 @@ jobs: matrix: targets: [esp32, esp32s2, esp32c3] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Build MCUboot bootloader uses: docker://docker.io/espressif/idf:release-v4.4 with: args: ./build_mcuboot.sh -s -c ${{matrix.targets}} - - uses: actions/upload-artifact@v2 + - uses: actions/upload-artifact@v3 with: name: mcuboot-builds path: out/ @@ -44,7 +44,7 @@ jobs: needs: [IDFboot, MCUboot] steps: - name: Download artifacts - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v3 with: path: buildartifacts/ - name: Update release From c30ee8b3710984e51841fbe00a7e40684f3df2aa Mon Sep 17 00:00:00 2001 From: Gustavo Henrique Nihei Date: Tue, 17 May 2022 10:55:10 -0300 Subject: [PATCH 4/4] ci: Set workspace as a safe directory This fixes an issue reported on https://github.com/actions/checkout/issues/760 Signed-off-by: Gustavo Henrique Nihei --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0353618..44c43ce 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -33,7 +33,7 @@ jobs: - name: Build MCUboot bootloader uses: docker://docker.io/espressif/idf:release-v4.4 with: - args: ./build_mcuboot.sh -s -c ${{matrix.targets}} + args: /bin/sh -c "git config --global --add safe.directory '*' && ./build_mcuboot.sh -s -c ${{matrix.targets}}" - uses: actions/upload-artifact@v3 with: name: mcuboot-builds