diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index c51e40ec..d0996c82 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -10,23 +10,31 @@ env: CARGO_TERM_COLOR: always jobs: - cargo_check: - runs-on: ubuntu-latest + rust_check: + strategy: + fail-fast: false + matrix: + os: [ubuntu-20.04, windows-2019, macos-10.15] + include: + - os: ubuntu-20.04 + test-options: '--no-fail-fast --bin wash --test "integration*"' + name: 'Unit and integration tests' + - os: windows-2019 + test-options: '--no-fail-fast --bin wash' + name: 'Unit tests' + - os: macos-10.15 + test-options: '--no-fail-fast --bin wash' + name: 'Unit tests' + runs-on: ${{ matrix.os }} steps: - - uses: actions/checkout@v2 - - name: Build - run: cargo build --verbose - - name: Run tests - run: make test-all - - name: Check fmt - run: cargo fmt -- --check - - clippy_check: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - run: rustup component add clippy - - uses: actions-rs/clippy-check@v1 - with: - token: ${{ secrets.GITHUB_TOKEN }} - args: --all-features + - uses: actions/checkout@v2 + - name: Launch integration test services + if: ${{ startswith(matrix.os, 'ubuntu') }} + uses: sudo-bot/action-docker-compose@latest + with: + cli-args: "-f ./tools/docker-compose.yml up --detach" + - id: rust-check-action + name: ${{ matrix.name }} + uses: wasmcloud/common-actions/rust-check@main + with: + test-options: ${{ matrix.test-options }} diff --git a/Cargo.lock b/Cargo.lock index a33adda7..51f20c99 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4294,7 +4294,7 @@ dependencies = [ [[package]] name = "wash-cli" -version = "0.8.0" +version = "0.8.1" dependencies = [ "anyhow", "assert-json-diff", diff --git a/Cargo.toml b/Cargo.toml index b36735ac..88d3a09e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "wash-cli" -version = "0.8.0" +version = "0.8.1" authors = ["wasmCloud Team"] categories = ["wasm", "command-line-utilities"] description = "wasmcloud Shell (wash) CLI tool" diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index 70116be0..b63e1866 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -1,6 +1,6 @@ name: wash base: core20 # the base snap is the execution environment for this snap -version: '0.7.0' +version: '0.8.0' summary: WAsmcloud SHell - A multi-tool for wasmCloud development. icon: snap/local/icon.png description: | @@ -19,4 +19,4 @@ parts: build-packages: - libssl-dev - pkg-config - - clang \ No newline at end of file + - clang diff --git a/src/util.rs b/src/util.rs index 32a76519..ca314c96 100644 --- a/src/util.rs +++ b/src/util.rs @@ -313,6 +313,6 @@ pub(crate) fn set_permissions_keys(path: &Path) -> Result<()> { } #[cfg(target_os = "windows")] -pub(crate) fn set_permissions(path: &PathBuf) -> Result<()> { +pub(crate) fn set_permissions_keys(path: &Path) -> Result<()> { Ok(()) }