Skip to content

Commit

Permalink
build: Update esp-idf to v5.1.3 and debian to latest bookworm
Browse files Browse the repository at this point in the history
  • Loading branch information
greenaddress authored and JamieDriver committed Apr 10, 2024
1 parent 9dbe79e commit 37220a3
Show file tree
Hide file tree
Showing 7 changed files with 12 additions and 12 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/github-actions-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,6 @@ jobs:
- name: esp-idf build
uses: espressif/esp-idf-ci-action@v1
with:
esp_idf_version: v5.1.2
esp_idf_version: v5.1.3
target: esp32
command: idf.py -D SDKCONFIG_DEFAULTS="configs/sdkconfig_jade_v1_1.defaults" build all size-components size
2 changes: 1 addition & 1 deletion .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ stages:
- test
- deploy

image: blockstream/verde@sha256:143688221be40affa09f3d0d45591339b5d6ef769a437e57d35148741a154482
image: blockstream/verde@sha256:f5461e9bca9617c8d4f8aca28b21aa418c4dafc3b89268079ce2b1d148085957

test_format:
tags:
Expand Down
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
FROM debian:bookworm@sha256:b16cef8cbcb20935c0f052e37fc3d38dc92bfec0bcfb894c328547f81e932d67 as base
FROM debian:bookworm@sha256:e97ee92bf1e11a2de654e9f3da827d8dce32b54e0490ac83bfc65c8706568116 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

FROM base AS esp-idf

# These ARGs are easily parseable (eg by HWI)
ARG ESP_IDF_BRANCH=v5.1.2
ARG ESP_IDF_COMMIT=482a8fb2d78e3b58eb21b26da8a5bedf90623213
ARG ESP_IDF_BRANCH=v5.1.3
ARG ESP_IDF_COMMIT=e7771c75bd1dbbfb7b3c5381be7e063b197c9734
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

Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.dev
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM blockstream/verde@sha256:143688221be40affa09f3d0d45591339b5d6ef769a437e57d35148741a154482
FROM blockstream/verde@sha256:f5461e9bca9617c8d4f8aca28b21aa418c4dafc3b89268079ce2b1d148085957

RUN echo "source /root/esp/esp-idf/export.sh" >> /etc/bash.bashrc

Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.2/esp32/get-started/index.html).
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).

Get the esp-idf sdk and required tools:

```
mkdir ~/esp
cd ~/esp
git clone -b v5.1.2 --recursive https://github.com/espressif/esp-idf.git
cd ~/esp/esp-idf && git checkout 482a8fb2d78e3b58eb21b26da8a5bedf90623213 && ./install.sh --enable-gdbgui esp32 esp32s3
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
```

Set up the environmental variables:
Expand Down
4 changes: 2 additions & 2 deletions dependencies.lock
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ dependencies:
component_hash: null
source:
type: idf
version: 5.1.2
manifest_hash: dcb6c640489c3318dcfbc90652ff7cb8af8391868cf3c5e86a46ad26c39b42f0
version: 5.1.3
manifest_hash: 3c2445ebfab64b98568e2d79210de5848c1f4b7a66ed43139a0422155c2ed43c
target: esp32
version: 1.0.0
2 changes: 1 addition & 1 deletion main/idf_component.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ dependencies:
espressif/esp32-camera: "==2.0.3"
espressif/cmake_utilities: "==0.5.2"
idf:
version: "==5.1.2"
version: "==5.1.3"

0 comments on commit 37220a3

Please sign in to comment.