Skip to content

Commit 603798d

Browse files
Support name argument of espup install (#43)
* feat: Add name arg * ci: Add test for name arg
1 parent 6b7faa3 commit 603798d

File tree

2 files changed

+11
-5
lines changed

2 files changed

+11
-5
lines changed

.github/workflows/ci.yaml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
- run: xtensa-esp32s3-elf-gcc --version
2929

3030
check-arguments:
31-
name: Check `buildtarget`, `version`, `override`, `ldproxy`, and `extended-llvm` arguments
31+
name: Check `buildtarget`, `version`, `override`, `ldproxy`, `name`,and `extended-llvm` arguments
3232
runs-on: ubuntu-latest
3333
steps:
3434
- run: rustup update stable && rustup default stable
@@ -41,11 +41,12 @@ jobs:
4141
buildtargets: esp32,esp32c3
4242
version: 1.64.0.0
4343
extended-llvm: true
44-
- run: rustc +esp --print target-list | grep xtensa
44+
name: xtensa
45+
- run: rustc +xtensa --print target-list | grep xtensa
4546
- run: env | grep LIBCLANG_PATH
4647
- run: xtensa-esp32-elf-gcc --version
4748
- run: ls $HOME/.cargo/bin/ldproxy | grep ldproxy
48-
- run: cargo +esp --version | grep 1.64.0
49+
- run: cargo +xtensa --version | grep 1.64.0
4950
- run: rustup default | grep stable
5051
- run: $CLANG_PATH --version | grep -i espressif
5152

action.yaml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,9 @@ inputs:
2828
extended-llvm:
2929
description: Install the whole LLVM instead of only installing the libs
3030
default: false
31+
name:
32+
description: Xtensa Rust toolchain name
33+
default: esp
3134

3235
runs:
3336
using: composite
@@ -70,7 +73,8 @@ runs:
7073
source "$HOME/.cargo/env"
7174
[[ "${{ inputs.version }}" != latest ]] && version="--toolchain-version ${{ inputs.version }}" || version=""
7275
[[ "${{ inputs.extended-llvm }}" = true ]] && extended_llvm="-e" || extended_llvm=""
73-
"$HOME/.cargo/bin/espup" install -l debug --targets ${{ inputs.buildtargets }} $extended_llvm $version
76+
[[ "${{ inputs.name }}" != esp ]] && name="--name ${{ inputs.name }}" || name=""
77+
"$HOME/.cargo/bin/espup" install -l debug --targets ${{ inputs.buildtargets }} $extended_llvm $version $name
7478
source "$HOME/exports"
7579
if [[ "${{ inputs.export }}" = true ]]; then
7680
echo "$PATH" >> "$GITHUB_PATH"
@@ -84,7 +88,8 @@ runs:
8488
run: |
8589
[[ "${{ inputs.version }}" != latest ]] && version="--toolchain-version ${{ inputs.version }}" || version=""
8690
[[ "${{ inputs.extended-llvm }}" = true ]] && extended_llvm="-e" || extended_llvm=""
87-
"$HOME/.cargo/bin/espup.exe" install -l debug --targets ${{ inputs.buildtargets }} $extended_llvm $version
91+
[[ "${{ inputs.name }}" != esp ]] && name="--name ${{ inputs.name }}" || name=""
92+
"$HOME/.cargo/bin/espup.exe" install -l debug --targets ${{ inputs.buildtargets }} $extended_llvm $version $name
8893
8994
- name: Set default and override
9095
shell: bash

0 commit comments

Comments
 (0)