diff --git a/.github/workflows/github-actions-test.yml b/.github/workflows/github-actions-test.yml index 1432672a..19d0299d 100644 --- a/.github/workflows/github-actions-test.yml +++ b/.github/workflows/github-actions-test.yml @@ -13,6 +13,6 @@ jobs: - name: esp-idf build uses: espressif/esp-idf-ci-action@v1 with: - esp_idf_version: v5.1.3 + esp_idf_version: v5.1.4 target: esp32 command: idf.py -D SDKCONFIG_DEFAULTS="configs/sdkconfig_jade_v1_1.defaults" build all size-components size diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4d1911e6..5a76d937 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -7,7 +7,7 @@ stages: - test - deploy -image: blockstream/verde@sha256:f5461e9bca9617c8d4f8aca28b21aa418c4dafc3b89268079ce2b1d148085957 +image: blockstream/verde@sha256:d75cbbf0d0af640216be07d202bbb4af3c86c5cc908761a4c0bd897e75b5023a test_format: tags: diff --git a/Dockerfile b/Dockerfile index 7486c5ac..d2567fea 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM debian:bookworm@sha256:e97ee92bf1e11a2de654e9f3da827d8dce32b54e0490ac83bfc65c8706568116 as base +FROM debian:bookworm@sha256:1aadfee8d292f64b045adb830f8a58bfacc15789ae5f489a0fedcd517a862cb9 as base RUN apt-get update -qq && apt-get upgrade --no-install-recommends --no-install-suggests -yqq && apt-get install --no-install-recommends --no-install-suggests -yqq git wget libncurses-dev flex bison gperf libffi-dev libssl-dev dfu-util cmake ninja-build ccache build-essential ca-certificates ccache cmake curl make pkg-config python3 python3-dev python3-pip python3-setuptools python3-serial python3-click python3-cryptography python3-future python3-pyparsing python3-pyelftools python3-pkg-resources python3-wheel python3-venv python3-sphinx unzip bluez-tools bluez libusb-1.0-0 clang-format libglib2.0-dev libpixman-1-dev libgcrypt20-dev virtualenv libslirp-dev && apt-get -yqq autoremove && apt-get -yqq clean && rm -rf /var/lib/apt/lists/* /var/cache/* /tmp/* RUN update-alternatives --install /usr/bin/python python /usr/bin/python3 10 RUN python3 -m pip install --break-system-packages --user pycodestyle @@ -6,8 +6,8 @@ RUN python3 -m pip install --break-system-packages --user pycodestyle FROM base AS esp-idf # These ARGs are easily parseable (eg by HWI) -ARG ESP_IDF_BRANCH=v5.1.3 -ARG ESP_IDF_COMMIT=e7771c75bd1dbbfb7b3c5381be7e063b197c9734 +ARG ESP_IDF_BRANCH=v5.1.4 +ARG ESP_IDF_COMMIT=d7b0a45ddbddbac53afb4fc28168f9f9259dbb79 RUN mkdir ~/esp && cd ~/esp && git clone --quiet --depth=1 --branch ${ESP_IDF_BRANCH} --single-branch --recursive --shallow-submodules https://github.com/espressif/esp-idf.git RUN cd ~/esp/esp-idf && git checkout ${ESP_IDF_COMMIT} && ./install.sh esp32 esp32s3 diff --git a/Dockerfile.dev b/Dockerfile.dev index 72239d30..95ca46e2 100644 --- a/Dockerfile.dev +++ b/Dockerfile.dev @@ -1,4 +1,4 @@ -FROM blockstream/verde@sha256:f5461e9bca9617c8d4f8aca28b21aa418c4dafc3b89268079ce2b1d148085957 +FROM blockstream/verde@sha256:d75cbbf0d0af640216be07d202bbb4af3c86c5cc908761a4c0bd897e75b5023a RUN echo "source /root/esp/esp-idf/export.sh" >> /etc/bash.bashrc diff --git a/README.md b/README.md index 2225c5f6..1492c27e 100644 --- a/README.md +++ b/README.md @@ -34,15 +34,15 @@ origin of the repo in the docker. Jade requires the esp-idf sdk. -More information is available in the [Espressif official guide](https://docs.espressif.com/projects/esp-idf/en/v5.1.3/esp32/get-started/index.html). +More information is available in the [Espressif official guide](https://docs.espressif.com/projects/esp-idf/en/v5.1.4/esp32/get-started/index.html). Get the esp-idf sdk and required tools: ``` mkdir ~/esp cd ~/esp -git clone -b v5.1.3 --recursive https://github.com/espressif/esp-idf.git -cd ~/esp/esp-idf && git checkout e7771c75bd1dbbfb7b3c5381be7e063b197c9734 && ./install.sh --enable-gdbgui esp32 esp32s3 +git clone -b v5.1.4 --recursive https://github.com/espressif/esp-idf.git +cd ~/esp/esp-idf && git checkout d7b0a45ddbddbac53afb4fc28168f9f9259dbb79 && ./install.sh --enable-gdbgui esp32 esp32s3 ``` Set up the environmental variables: diff --git a/dependencies.lock.esp32 b/dependencies.lock.esp32 index 2d846a1e..5fcf2f75 100644 --- a/dependencies.lock.esp32 +++ b/dependencies.lock.esp32 @@ -51,7 +51,7 @@ dependencies: component_hash: null source: type: idf - version: 5.1.3 -manifest_hash: 86a960cf40f1aaed226ad32e8af9725f0288f1f6a7f38e3d89bfda8196794ba0 + version: 5.1.4 +manifest_hash: 1193c708ba48d3f11c6e01e3f3677a4494fe2675b26024c840e286ace1ee817b target: esp32 version: 1.0.0 diff --git a/main/idf_component.yml b/main/idf_component.yml index 876bae91..4e0221a0 100644 --- a/main/idf_component.yml +++ b/main/idf_component.yml @@ -23,4 +23,4 @@ dependencies: rules: - if: "target in [esp32s3]" idf: - version: "==5.1.3" + version: "==5.1.4"