Skip to content

Commit

Permalink
Merge pull request #1369 from pguyot/w46/fix-ci-rebar3
Browse files Browse the repository at this point in the history
Fix ESP32 build CI by installing missing rebar3 dependency

These changes are made under both the "Apache 2.0" and the "GNU Lesser General
Public License 2.1 or later" license terms (dual license).

SPDX-License-Identifier: Apache-2.0 OR LGPL-2.1-or-later
  • Loading branch information
bettio committed Nov 21, 2024
2 parents 1cddf54 + 8ce4b1d commit 94ced13
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 2 deletions.
7 changes: 7 additions & 0 deletions .github/workflows/esp32-build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,14 @@ jobs:
apt update
DEBIAN_FRONTEND=noninteractive apt install -y -q \
doxygen erlang-base erlang-dev erlang-dialyzer erlang-eunit \
erlang-asn1 erlang-common-test erlang-crypto erlang-edoc \
erlang-parsetools erlang-reltool erlang-syntax-tools erlang-tools \
libglib2.0-0 libpixman-1-0 \
gcc g++ zlib1g-dev libsdl2-2.0-0 libslirp0 libmbedtls-dev
# ESP-IDF 5.0.7 comes with Ubuntu focal which has Erlang/OTP 22
wget --no-verbose https://github.com/erlang/rebar3/releases/download/3.18.0/rebar3
chmod +x rebar3
./rebar3 local install
- name: Install qemu binary from espressif/qemu esp32
if: runner.arch != 'ARM64' && runner.os == 'Linux' && matrix.esp-idf-target == 'esp32'
Expand Down Expand Up @@ -137,6 +143,7 @@ jobs:
set -e
. $IDF_PATH/export.sh
export IDF_TARGET=${{matrix.esp-idf-target}}
export PATH=${PATH}:${HOME}/.cache/rebar3/bin
idf.py set-target ${{matrix.esp-idf-target}}
idf.py build
Expand Down
4 changes: 2 additions & 2 deletions CMakeModules/BuildErlang.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -92,15 +92,15 @@ macro(pack_lib avm_name)
COMMENT "Creating UF2 file ${avm_name}.uf2"
VERBATIM
)
add_dependencies(${avm_name}-pico.uf2 ${avm_name})
add_dependencies(${avm_name}-pico.uf2 ${avm_name} uf2tool)

add_custom_target(
${avm_name}-pico2.uf2 ALL
COMMAND ${CMAKE_BINARY_DIR}/tools/uf2tool/uf2tool create -o ${avm_name}-pico2.uf2 -f data -s 0x10100000 ${avm_name}.avm
COMMENT "Creating UF2 file ${avm_name}.uf2"
VERBATIM
)
add_dependencies(${avm_name}-pico2.uf2 ${avm_name})
add_dependencies(${avm_name}-pico2.uf2 ${avm_name} uf2tool)

endmacro()

Expand Down

0 comments on commit 94ced13

Please sign in to comment.