Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
- run: xtensa-esp32s3-elf-gcc --version

check-arguments:
name: Check `buildtarget`, `version`, `override`, `ldproxy`, and `extended-llvm` arguments
name: Check `buildtarget`, `version`, `override`, `ldproxy`, `name`,and `extended-llvm` arguments
runs-on: ubuntu-latest
steps:
- run: rustup update stable && rustup default stable
Expand All @@ -41,11 +41,12 @@ jobs:
buildtargets: esp32,esp32c3
version: 1.64.0.0
extended-llvm: true
- run: rustc +esp --print target-list | grep xtensa
name: xtensa
- run: rustc +xtensa --print target-list | grep xtensa
- run: env | grep LIBCLANG_PATH
- run: xtensa-esp32-elf-gcc --version
- run: ls $HOME/.cargo/bin/ldproxy | grep ldproxy
- run: cargo +esp --version | grep 1.64.0
- run: cargo +xtensa --version | grep 1.64.0
- run: rustup default | grep stable
- run: $CLANG_PATH --version | grep -i espressif

Expand Down
9 changes: 7 additions & 2 deletions action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,9 @@ inputs:
extended-llvm:
description: Install the whole LLVM instead of only installing the libs
default: false
name:
description: Xtensa Rust toolchain name
default: esp

runs:
using: composite
Expand Down Expand Up @@ -70,7 +73,8 @@ runs:
source "$HOME/.cargo/env"
[[ "${{ inputs.version }}" != latest ]] && version="--toolchain-version ${{ inputs.version }}" || version=""
[[ "${{ inputs.extended-llvm }}" = true ]] && extended_llvm="-e" || extended_llvm=""
"$HOME/.cargo/bin/espup" install -l debug --targets ${{ inputs.buildtargets }} $extended_llvm $version
[[ "${{ inputs.name }}" != esp ]] && name="--name ${{ inputs.name }}" || name=""
"$HOME/.cargo/bin/espup" install -l debug --targets ${{ inputs.buildtargets }} $extended_llvm $version $name
source "$HOME/exports"
if [[ "${{ inputs.export }}" = true ]]; then
echo "$PATH" >> "$GITHUB_PATH"
Expand All @@ -84,7 +88,8 @@ runs:
run: |
[[ "${{ inputs.version }}" != latest ]] && version="--toolchain-version ${{ inputs.version }}" || version=""
[[ "${{ inputs.extended-llvm }}" = true ]] && extended_llvm="-e" || extended_llvm=""
"$HOME/.cargo/bin/espup.exe" install -l debug --targets ${{ inputs.buildtargets }} $extended_llvm $version
[[ "${{ inputs.name }}" != esp ]] && name="--name ${{ inputs.name }}" || name=""
"$HOME/.cargo/bin/espup.exe" install -l debug --targets ${{ inputs.buildtargets }} $extended_llvm $version $name

- name: Set default and override
shell: bash
Expand Down