Skip to content

Commit 94ced13

Browse files
committed
Merge pull request #1369 from pguyot/w46/fix-ci-rebar3
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
2 parents 1cddf54 + 8ce4b1d commit 94ced13

File tree

2 files changed

+9
-2
lines changed

2 files changed

+9
-2
lines changed

.github/workflows/esp32-build.yaml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,14 @@ jobs:
7474
apt update
7575
DEBIAN_FRONTEND=noninteractive apt install -y -q \
7676
doxygen erlang-base erlang-dev erlang-dialyzer erlang-eunit \
77+
erlang-asn1 erlang-common-test erlang-crypto erlang-edoc \
78+
erlang-parsetools erlang-reltool erlang-syntax-tools erlang-tools \
7779
libglib2.0-0 libpixman-1-0 \
7880
gcc g++ zlib1g-dev libsdl2-2.0-0 libslirp0 libmbedtls-dev
81+
# ESP-IDF 5.0.7 comes with Ubuntu focal which has Erlang/OTP 22
82+
wget --no-verbose https://github.com/erlang/rebar3/releases/download/3.18.0/rebar3
83+
chmod +x rebar3
84+
./rebar3 local install
7985
8086
- name: Install qemu binary from espressif/qemu esp32
8187
if: runner.arch != 'ARM64' && runner.os == 'Linux' && matrix.esp-idf-target == 'esp32'
@@ -137,6 +143,7 @@ jobs:
137143
set -e
138144
. $IDF_PATH/export.sh
139145
export IDF_TARGET=${{matrix.esp-idf-target}}
146+
export PATH=${PATH}:${HOME}/.cache/rebar3/bin
140147
idf.py set-target ${{matrix.esp-idf-target}}
141148
idf.py build
142149

CMakeModules/BuildErlang.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,15 +92,15 @@ macro(pack_lib avm_name)
9292
COMMENT "Creating UF2 file ${avm_name}.uf2"
9393
VERBATIM
9494
)
95-
add_dependencies(${avm_name}-pico.uf2 ${avm_name})
95+
add_dependencies(${avm_name}-pico.uf2 ${avm_name} uf2tool)
9696

9797
add_custom_target(
9898
${avm_name}-pico2.uf2 ALL
9999
COMMAND ${CMAKE_BINARY_DIR}/tools/uf2tool/uf2tool create -o ${avm_name}-pico2.uf2 -f data -s 0x10100000 ${avm_name}.avm
100100
COMMENT "Creating UF2 file ${avm_name}.uf2"
101101
VERBATIM
102102
)
103-
add_dependencies(${avm_name}-pico2.uf2 ${avm_name})
103+
add_dependencies(${avm_name}-pico2.uf2 ${avm_name} uf2tool)
104104

105105
endmacro()
106106

0 commit comments

Comments
 (0)