Skip to content
This repository has been archived by the owner on Oct 31, 2023. It is now read-only.

Renamed windows set_keys util function #230

Merged
merged 4 commits into from
Jan 18, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 27 additions & 19 deletions .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
2 changes: 1 addition & 1 deletion Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
4 changes: 2 additions & 2 deletions snap/snapcraft.yaml
Original file line number Diff line number Diff line change
@@ -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: |
Expand All @@ -19,4 +19,4 @@ parts:
build-packages:
- libssl-dev
- pkg-config
- clang
- clang
2 changes: 1 addition & 1 deletion src/util.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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(())
}