Skip to content

Commit ec6d365

Browse files
authored
Add support for espup's --esp-riscv-gcc flag (#46)
* Fix lint: 'Incorrect type. Expected "string".' * Add option to install Espressif RISC-V toolchain
1 parent 67649b2 commit ec6d365

File tree

1 file changed

+12
-7
lines changed

1 file changed

+12
-7
lines changed

action.yaml

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ branding:
99
inputs:
1010
default:
1111
description: Set installed toolchain as default
12-
default: false
12+
default: "false"
1313
buildtargets:
1414
description: Comma separated list of targets
1515
default: esp32,esp32s2,esp32s3
@@ -18,19 +18,22 @@ inputs:
1818
default: latest
1919
ldproxy:
2020
description: Whether to install ldproxy (required for `std`)
21-
default: false
21+
default: "false"
2222
override:
2323
description: Whether to override the toolchain
24-
default: true
24+
default: "true"
2525
export:
2626
description: Whether to export the `${ESPUP_EXPORT_FILE}` into the GitHub environment
27-
default: true
27+
default: "true"
2828
extended-llvm:
2929
description: Install the whole LLVM instead of only installing the libs
30-
default: false
30+
default: "false"
3131
name:
3232
description: Xtensa Rust toolchain name
3333
default: esp
34+
esp-riscv-gcc:
35+
description: Install Espressif RISC-V toolchain built with croostool-ng
36+
default: "false"
3437

3538
runs:
3639
using: composite
@@ -74,7 +77,8 @@ runs:
7477
[[ "${{ inputs.version }}" != latest ]] && version="--toolchain-version ${{ inputs.version }}" || version=""
7578
[[ "${{ inputs.extended-llvm }}" = true ]] && extended_llvm="-e" || extended_llvm=""
7679
[[ "${{ inputs.name }}" != esp ]] && name="--name ${{ inputs.name }}" || name=""
77-
"$HOME/.cargo/bin/espup" install -l debug --targets ${{ inputs.buildtargets }} $extended_llvm $version $name
80+
[[ "${{ inputs.esp-riscv-gcc }}" = true ]] && esp_riscv_gcc="-r" || esp_riscv_gcc=""
81+
"$HOME/.cargo/bin/espup" install -l debug --targets ${{ inputs.buildtargets }} $esp_riscv_gcc $extended_llvm $version $name
7882
source "$HOME/exports"
7983
if [[ "${{ inputs.export }}" = true ]]; then
8084
echo "$PATH" >> "$GITHUB_PATH"
@@ -89,7 +93,8 @@ runs:
8993
[[ "${{ inputs.version }}" != latest ]] && version="--toolchain-version ${{ inputs.version }}" || version=""
9094
[[ "${{ inputs.extended-llvm }}" = true ]] && extended_llvm="-e" || extended_llvm=""
9195
[[ "${{ inputs.name }}" != esp ]] && name="--name ${{ inputs.name }}" || name=""
92-
"$HOME/.cargo/bin/espup.exe" install -l debug --targets ${{ inputs.buildtargets }} $extended_llvm $version $name
96+
[[ "${{ inputs.esp-riscv-gcc }}" = true ]] && esp_riscv_gcc="-r" || esp_riscv_gcc=""
97+
"$HOME/.cargo/bin/espup.exe" install -l debug --targets ${{ inputs.buildtargets }} $esp_riscv_gcc $extended_llvm $version $name
9398
9499
- name: Set default and override
95100
shell: bash

0 commit comments

Comments
 (0)