Skip to content
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

Fixes to Rust setup in CI #1329

Merged
merged 2 commits into from
Aug 22, 2022
Merged

Fixes to Rust setup in CI #1329

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
fd9c374
CI: Delete rustup cache in case of any failures
cmnrd Aug 22, 2022
06a9776
CI: fix setting a specific runtime ref for Rust
cmnrd Aug 22, 2022
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
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ jobs:

# Run the Rust integration tests.
rs-tests:
uses: lf-lang/lingua-franca/.github/workflows/rs-tests.yml@master
uses: lf-lang/lingua-franca/.github/workflows/rs-tests.yml@ci-rust-fix
needs: cancel

# Run the Rust benchmark tests.
Expand Down
22 changes: 18 additions & 4 deletions .github/workflows/rs-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,29 @@ jobs:
ref: ${{ inputs.compiler-ref }}
- name: Prepare build environment
uses: ./.github/actions/prepare-build-env
- name: Check out specific ref of reactor-rs
uses: actions/checkout@v3
with:
repository: lf-lang/reactor-rs
path: org.lflang/src/lib/rs/reactor-rs
ref: ${{ inputs.runtime-ref }}
if: ${{ inputs.runtime-ref }}
- name: Setup Rust
id: rustup
uses: ATiltedTree/setup-rust@v1
with:
rust-version: ${{ matrix.rust }}
components: clippy
continue-on-error: true
- name: Delete rustup cache
run: rm -rf ~/.rustup
if: ${{ steps.rustup.outcome }} != "success"
- name: Setup Rust (again)
if: ${{ steps.rustup.outcome }} != "success"
uses: ATiltedTree/setup-rust@v1
with:
rust-version: ${{ matrix.rust }}
components: clippy
- name: Set rust runtime version
run: |
echo ${{ inputs.runtime-ref }} > org.lflang/src/org/lflang/generator/rust/rust-runtime-version.txt
if: ${{ inputs.runtime-ref }}
- name: Run Rust tests
run: |
./gradlew test --tests org.lflang.tests.runtime.RustTest.*
Expand Down