Skip to content

Commit

Permalink
Merge pull request #6 from shakacode/allow-unlabeled-command
Browse files Browse the repository at this point in the history
Allow unlabeled command
  • Loading branch information
alex35mil authored Jun 18, 2024
2 parents 4272ead + b0b18ab commit 5d5b35f
Show file tree
Hide file tree
Showing 6 changed files with 290 additions and 26 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [ ubuntu-latest, macOS-latest, windows-latest ]
os: [ ubuntu-latest, macOS-latest ] # windows build is broken, see the note in README
steps:
- name: Checkout sources
uses: actions/checkout@v2
Expand All @@ -21,7 +21,7 @@ jobs:
uses: actions-rs/toolchain@v1
with:
profile: minimal
toolchain: 1.66.0
toolchain: 1.78.0
override: true
components: rustfmt, clippy

Expand Down
12 changes: 12 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,17 @@
# Changelog

### 0.0.6
- Allow unlabeled command:

```rust
cmd! {
"cargo build",
env: Env::empty(),
pwd: Loc::root(),
msg: "Building a server",
}
```

### 0.0.5
- Fix non-TLS build.

Expand Down
3 changes: 3 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@ See [docs.rs/steward](https://docs.rs/steward).
See [`examples`](./examples).

## Limitations
### Windows
Apparently, Windows build is broken on recent versions of Rust due to [`winapi`](https://github.com/retep998/winapi-rs) being unmaintained. We need to migrate to [`windows-rs`](https://github.com/microsoft/windows-rs), but I don't know anything about Windows, so help is very welcome!

### Async runtimes
Tokio only.

Expand Down
8 changes: 4 additions & 4 deletions examples/cli/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ mod client {

pub fn build() -> Cmd {
cmd! {
exe: "rescript build -with-deps",
"rescript build -with-deps",
env: env(),
pwd: Loc::client(),
msg: "Building ReScript client",
Expand All @@ -91,7 +91,7 @@ mod client {
tag: "rescript",
cmd:
cmd! {
exe: "rescript build -w",
"rescript build -w",
env: env(),
pwd: Loc::client(),
msg: "Watching ReScript client",
Expand All @@ -105,7 +105,7 @@ mod server {

pub fn build() -> Cmd {
cmd! {
exe: "cargo build --package=server",
"cargo build --package=server",
env: Config::to_env(),
pwd: Loc::root(),
msg: "Building Rust server",
Expand All @@ -117,7 +117,7 @@ mod server {
tag: "server",
cmd:
cmd! {
exe: "cargo watch --watch server --exec 'run --package=server --color=always'",
"cargo watch --watch server --exec 'run --package=server --color=always'",
env: Config::to_env(),
pwd: Loc::root(),
msg: "Running reloadable Rust server",
Expand Down
Loading

0 comments on commit 5d5b35f

Please sign in to comment.