Skip to content

Commit

Permalink
Merge pull request #1316 from bettio/fix-esp32-mkimage-gh-workflow
Browse files Browse the repository at this point in the history
CI: fix `esp32-mkimage` GH workflow

It was making Elixir images without Elixir.

Also add an additional debug message to mkimage.erl.

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 Oct 12, 2024
2 parents 9241f0a + 7b6abf1 commit 59da922
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/esp32-mkimage.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -142,8 +142,8 @@ jobs:
./mkimage.sh
else
FLAVOR_SUFFIX=$(echo "${{ matrix.flavor }}" | sed 's/-//g')
BOOT_FILE="build/libs/esp32boot/${FLAVOR_SUFFIX}_esp32boot.avm"
./mkimage.sh --boot="$BOOT_FILE"
BOOT_FILE="../../../../build/libs/esp32boot/${FLAVOR_SUFFIX}_esp32boot.avm"
./mkimage.sh --boot "$BOOT_FILE"
mv atomvm-${{ matrix.soc }}.img atomvm-${{ matrix.soc }}${{ matrix.flavor }}.img
fi
ls -l *.img
Expand Down
1 change: 1 addition & 0 deletions src/platforms/esp32/tools/mkimage.erl
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,7 @@ get_build_dir(Opts, RootDir) ->
%% @private
mkimage(RootDir, BuildDir, BootFile, OutputFile, Segments) ->
io:format("Writing output to ~s~n", [OutputFile]),
io:format("boot file is ~s~n", [BootFile]),
io:format("=============================================~n"),
case file:open(OutputFile, [write, binary]) of
{ok, Fout} ->
Expand Down

0 comments on commit 59da922

Please sign in to comment.