Skip to content

Commit

Permalink
Attempt to rearrange the CI builds
Browse files Browse the repository at this point in the history
  • Loading branch information
petervdonovan committed May 22, 2024
1 parent b68a409 commit 62f5bef
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 7 deletions.
13 changes: 6 additions & 7 deletions .github/actions/build/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,13 @@ runs:
- name: Install the wasm-pack dev dependency globally
run: npm install -g wasm-pack
shell: bash
- name: Setup Rust
uses: actions-rs/toolchain@v1
with:
toolchain: stable
components: clippy
- name: Build the VS Code extension
run: npm install --ignore-scripts
run: npm install --ignore-scripts && npm run compile
shell: bash
- name: Install Code
run: |
Expand Down Expand Up @@ -64,12 +69,6 @@ runs:
run: npm i -g pnpm
shell: bash
if: ${{ inputs.partial == 'false' }}
- name: Setup Rust
uses: actions-rs/toolchain@v1
with:
toolchain: stable
components: clippy
if: ${{ inputs.partial == 'false' }}
- name: Install RTI
run: |
cd lingua-franca
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/dependency-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ jobs:
- name: Uninstall dependencies
run: |
python3 -m pip uninstall -y pylint
rustup self uninstall -y
- name: Run tests (Linux)
run: xvfb-run --auto-servernum --server-args="-screen 0 1280x960x24" -- npm run test-dependencies-missing-extended
if: ${{ runner.os == 'Linux' }}
Expand All @@ -84,6 +85,9 @@ jobs:
- uses: lf-lang/vscode-lingua-franca/.github/actions/build@main
with:
partial: "true"
- name: Uninstall dependencies
run: |
rustup self uninstall -y
- name: Run tests (Linux)
run: xvfb-run --auto-servernum --server-args="-screen 0 1280x960x24" -- npm run test-dependencies-missing-basic
if: ${{ runner.os == 'Linux' }}
Expand Down

0 comments on commit 62f5bef

Please sign in to comment.