diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2d9ae662d4..08024f174a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -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. diff --git a/.github/workflows/rs-tests.yml b/.github/workflows/rs-tests.yml index e29e295571..2681a7b3ef 100644 --- a/.github/workflows/rs-tests.yml +++ b/.github/workflows/rs-tests.yml @@ -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.*