Skip to content

Add option to install Extended LLVM installation #41

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
SergioGasquez merged 2 commits into from
Jun 25, 2025
Merged

Add option to install Extended LLVM installation #41

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2923682
Add `extended-llvm` action input
jessebraham Jun 23, 2025
02757de
Add CI check for `extended-llvm` input
jessebraham Jun 24, 2025
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
12 changes: 7 additions & 5 deletions .github/workflows/ci.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
name: Check environmnent
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: ./
name: Install Xtensa Rust
with:
Expand All @@ -28,35 +28,37 @@ jobs:
- run: xtensa-esp32s3-elf-gcc --version

check-arguments:
name: Check `buildtarget`, `version`, `override` and `ldproxy` arguments
name: Check `buildtarget`, `version`, `override`, `ldproxy`, and `extended-llvm` arguments
runs-on: ubuntu-latest
steps:
- run: rustup update stable && rustup default stable
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: ./
name: Install Xtensa Rust
with:
override: false
ldproxy: true
buildtargets: esp32,esp32c3
version: 1.64.0.0
extended-llvm: true
- run: rustc +esp --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: rustup default | grep stable
- run: $CLANG_PATH --version | grep -i espressif

check-host-targets:
name: Check host | ${{ matrix.os }}
strategy:
fail-fast: false
matrix:
os: [windows-latest, macos-latest]
os: [windows-latest, macos-latest]
runs-on: ${{ matrix.os }}
steps:
- run: rustup update stable && rustup default stable
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: ./
name: Install Xtensa Rust
- run: rustc +esp --print target-list | grep xtensa
17 changes: 9 additions & 8 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,14 +47,15 @@ jobs:

This action can be configured in various ways using its inputs:

| Name | Description | Type | Default |
| :------------: | :-----------------------------------------------: | :----: | :------: |
| `default` | Set installed toolchain as a default toolchain | bool | `false` |
| `buildtargets` | Comma separated list of targets | string | _all_ |
| `version` | Which version of the toolchain to install | string | _latest_ |
| `ldproxy` | Whether to install `ldproxy` (required for `std`) | bool | `true` |
| `override` | Overrides the installed toolchain | bool | `true` |
| `export` | Sources `${ESPUP_EXPORT_FILE}` | bool | `true` |
| Name | Description | Type | Default |
| :-------------: | :--------------------------------------------------------: | :----: | :------: |
| `default` | Set installed toolchain as a default toolchain | bool | `false` |
| `buildtargets` | Comma separated list of targets | string | _all_ |
| `version` | Which version of the toolchain to install | string | _latest_ |
| `ldproxy` | Whether to install `ldproxy` (required for `std`) | bool | `true` |
| `override` | Overrides the installed toolchain | bool | `true` |
| `export` | Sources `${ESPUP_EXPORT_FILE}` | bool | `true` |
| `extended-llvm` | Install the whole LLVM instead of only installing the libs | bool | `false` |

All inputs are optional; if no inputs are provided:

Expand Down
10 changes: 8 additions & 2 deletions action.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,9 @@ inputs:
export:
description: Whether to export the `${ESPUP_EXPORT_FILE}` into the GitHub environment
default: true
extended-llvm:
description: Install the whole LLVM instead of only installing the libs
default: false

runs:
using: composite
Expand Down Expand Up @@ -66,19 +69,22 @@ runs:
run: |
source "$HOME/.cargo/env"
[[ "${{ inputs.version }}" != latest ]] && version="--toolchain-version ${{ inputs.version }}" || version=""
"$HOME/.cargo/bin/espup" install -l debug --targets ${{ inputs.buildtargets }} $version
[[ "${{ inputs.extended-llvm }}" = true ]] && extended_llvm="-e" || extended_llvm=""
"$HOME/.cargo/bin/espup" install -l debug --targets ${{ inputs.buildtargets }} $extended_llvm $version
source "$HOME/exports"
if [[ "${{ inputs.export }}" = true ]]; then
echo "$PATH" >> "$GITHUB_PATH"
echo "LIBCLANG_PATH=${LIBCLANG_PATH}" >> "$GITHUB_ENV"
echo "CLANG_PATH=${CLANG_PATH}" >> "$GITHUB_ENV"
fi

- name: Install Xtensa toolchain (Windows)
if: env.HOST_TARGET == 'x86_64-pc-windows-msvc'
shell: bash
run: |
[[ "${{ inputs.version }}" != latest ]] && version="--toolchain-version ${{ inputs.version }}" || version=""
"$HOME/.cargo/bin/espup.exe" install -l debug --targets ${{ inputs.buildtargets }} $version
[[ "${{ inputs.extended-llvm }}" = true ]] && extended_llvm="-e" || extended_llvm=""
"$HOME/.cargo/bin/espup.exe" install -l debug --targets ${{ inputs.buildtargets }} $extended_llvm $version

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