Skip to content

Commit 212e901

Browse files
authored
Merge pull request #67 from thedodd/fix-ci
Fix deps to work with CI cache.
2 parents cec7eea + dcc80b6 commit 212e901

File tree

4 files changed

+23
-12
lines changed

4 files changed

+23
-12
lines changed

.github/workflows/ci.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,9 @@ jobs:
7676
uses: actions/checkout@v2
7777

7878
- name: Setup | Cache Cargo
79+
# WHY? Because we are getting: error[E0463]: can't find crate for `structopt_derive` which `structopt` depends on
80+
# only on macos when using the cache.
81+
if: matrix.os != 'macos-latest'
7982
uses: actions/cache@v2
8083
with:
8184
path: |

Cargo.lock

Lines changed: 4 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ sass-rs = "0.2.2"
3333
seahash = "4.0.1"
3434
serde = { version="1", features=["derive"] }
3535
structopt = "0.3.18"
36-
structopt_derive = "0.4.11"
36+
structopt-derive = "0.4.11"
3737
surf = "=2.0.0-alpha.7"
3838
tide = { version="0.13.0", features=["unstable"] }
3939
toml = "0.5.6"

README.md

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,21 +20,28 @@
2020
Trunk is a WASM web application bundler for Rust. Trunk uses a simple, zero-config pattern for building & bundling WASM, JS snippets & other assets (images, css, scss) via a source HTML file.
2121

2222
## getting started
23+
### install
24+
First, install Trunk via one of the following options.
2325
```bash
24-
# Install trunk via cargo.
26+
# Install via cargo.
2527
cargo install trunk
2628

27-
# Alternatively, install a release binary (great for CI).
28-
wget -qO trunk.zip ${LINK_TO_RELEASE_BINARY} && \
29-
unzip trunk.zip && \
30-
chmod a+x trunk
29+
# Install a release binary (great for CI).
30+
VERSION=v0.6.0
31+
wget -qO- https://github.com/thedodd/trunk/releases/download/${VERSION}/trunk-x86_64-unknown-linux-gnu.tar.gz | tar -xzf-
3132

32-
# Install wasm-bindgen-cli.
33-
# NOTE: in the future, trunk will do this for you.
33+
# Install via homebrew on Mac, Linux or Windows (WSL).
34+
# (coming soon)
35+
brew install trunk
36+
```
37+
<small>Release binaries can be found on the [Github releases page](https://github.com/thedodd/trunk/releases).</small>
38+
39+
Next, we will need to install `wasm-bindgen-cli`. In the future Trunk will handle this for you.
40+
```
3441
cargo install wasm-bindgen-cli
3542
```
36-
Release binaries can be found on the [Github releases page](https://github.com/thedodd/trunk/releases).
3743

44+
### app setup
3845
Get setup with your favorite `wasm-bindgen` based framework. [Yew](https://github.com/yewstack/yew) & [Seed](https://github.com/seed-rs/seed) are the most popular options today, but there are others. Trunk will work with any `wasm-bindgen` based framework. The easiest way to ensure that your application launches properly is to [setup your app as an executable](https://doc.rust-lang.org/cargo/guide/project-layout.html) with a standard `main` function:
3946

4047
```rust

0 commit comments

Comments
 (0)