diff --git a/.github/workflows/CI.yaml b/.github/workflows/CI.yaml index ec546cf8..b8ebed57 100644 --- a/.github/workflows/CI.yaml +++ b/.github/workflows/CI.yaml @@ -1,4 +1,3 @@ - name: CI on: @@ -19,8 +18,8 @@ jobs: strategy: matrix: include: - - os: macos-latest - target: x86_64-osx + # - os: macos-latest + # target: x86_64-osx - os: ubuntu-latest target: x86_64-unknown-linux-gnu coverage: true @@ -43,7 +42,10 @@ jobs: - name: Collect coverage data if: ${{matrix.coverage}} - run: cargo llvm-cov nextest --lcov --output-path lcov.info + uses: actions-rs/cargo@v1 + with: + command: llvm-cov + args: nextest --lcov --output-path lcov.info --test-threads=1 - name: Upload coverage to Codecov if: ${{matrix.coverage}} @@ -59,7 +61,6 @@ jobs: command: nextest args: run --test-threads=1 - lints: name: Lints & Format runs-on: ubuntu-latest @@ -104,4 +105,4 @@ jobs: - name: Run bats test harnesss run: | docker build -t bombadil-tests ./ - docker run bombadil-tests \ No newline at end of file + docker run bombadil-tests diff --git a/src/dots.rs b/src/dots.rs index 51aec9f1..bbde5c6b 100644 --- a/src/dots.rs +++ b/src/dots.rs @@ -423,7 +423,7 @@ mod tests { vars: Dot::default_vars(), }; - run_cmd!(ls - larth)?; + run_cmd! {ls -larth}?; dot.traverse_and_copy( &source, @@ -580,6 +580,7 @@ mod tests { mkdir dir; echo "Hello {{name}}" > dir/template; echo "name=\"Tom\"" > dir/my_vars.toml; + ls -larth; )?; let dot = Dot { diff --git a/src/gpg.rs b/src/gpg.rs index 6072ca5e..579e5648 100644 --- a/src/gpg.rs +++ b/src/gpg.rs @@ -124,7 +124,7 @@ mod test { run_cmd!( gpg --batch --yes --import $crate_dir/tests/gpg/public.gpg; gpg --batch --yes --import $crate_dir/tests/gpg/private.gpg; - gpg --batch --yes --import-ownertrust < $crate_dir/tests/gpg/trust.txt + gpg --batch --yes --import-ownertrust < $crate_dir/tests/gpg/trust.txt; ) .unwrap(); }