Skip to content

Commit

Permalink
Run CI on Windows and MacOS (#35)
Browse files Browse the repository at this point in the history
* Run CI on Windows and MacOS (#34)

* Setup tmate session in case of CI failure (#34)

* Removes windows

* cargo test on single thread

* cd before removing current dir

* windows ci is back

* fix cargo doc warnings

Co-authored-by: Daniel T <30197399+danwt@users.noreply.github.com>
Co-authored-by: Ranadeep Biswas <ranadeep@informal.systems>
  • Loading branch information
3 people authored Aug 24, 2021
1 parent 32706f1 commit a905c1f
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 9 deletions.
13 changes: 12 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,13 @@ on: [push, pull_request]
jobs:
test:
name: Test Suite
runs-on: ubuntu-latest
runs-on: ${{ matrix.os }}
strategy:
matrix:
os:
- windows-latest
- ubuntu-latest
- macos-latest
steps:
- uses: actions/checkout@v2
- uses: actions-rs/toolchain@v1
Expand All @@ -17,6 +23,11 @@ jobs:
with:
command: test
args: -- --test-threads=1
- name: Setup tmate session
if: ${{ failure() }}
uses: mxschmitt/action-tmate@v3
with:
limit-access-to-actor: true

fmt:
name: Rustfmt
Expand Down
4 changes: 2 additions & 2 deletions modelator/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -118,10 +118,10 @@ pub fn traces<P: AsRef<Path>>(
)
.collect::<Result<Vec<_>, _>>()?;

// cleanup everything by removing the temporary directory
dir.close()?;
// restore the current directory
env::set_current_dir(current_dir)?;
// cleanup everything by removing the temporary directory
dir.close()?;

// convert each tla trace to json
traces
Expand Down
12 changes: 6 additions & 6 deletions modelator/src/module/apalache/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,14 @@ use std::process::Command;
pub struct Apalache;

impl Apalache {
/// ```ignore
/// TODO: ignoring because of https://github.com/informalsystems/modelator/issues/47
/// TODO: ignoring because of <https://github.com/informalsystems/modelator/issues/47>
///
/// Generate a TLA+ trace given a [TlaFile] and a [TlaConfigFile] produced
/// by [crate::module::Tla::generate_tests].
///
/// # Examples
///
/// ```
/// ```ignore
/// use modelator::artifact::{TlaFile, TlaConfigFile};
/// use modelator::module::{Tla, Apalache};
/// use modelator::Options;
Expand Down Expand Up @@ -78,14 +78,14 @@ impl Apalache {
}
}

/// ```ignore
/// TODO: ignoring because of https://github.com/informalsystems/modelator/issues/47
/// TODO: ignoring because of <https://github.com/informalsystems/modelator/issues/47>.
///
/// Runs Apalache's `parse` command, returning the [TlaFile] produced by
/// Apalache.
///
/// # Examples
///
/// ```
/// ```ignore
/// use modelator::artifact::TlaFile;
/// use modelator::module::Apalache;
/// use modelator::Options;
Expand Down

0 comments on commit a905c1f

Please sign in to comment.