Skip to content

Commit 13536a6

Browse files
authored
Merge branch 'master' into text-decoration
2 parents 34c57c1 + 6a54dcb commit 13536a6

123 files changed

Lines changed: 6992 additions & 2953 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/build.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -302,6 +302,7 @@ jobs:
302302
env:
303303
WASM_BINDGEN_CLI_VERSION: "0.2.121"
304304
BINARYEN_VERSION: "130"
305+
CARGO_ABOUT_VERSION: "0.9.0"
305306

306307
steps:
307308
- name: 📥 Clone repository
@@ -358,7 +359,7 @@ jobs:
358359
tar -xzf "$env:RUNNER_TEMP\binaryen.tar.gz" -C $env:RUNNER_TEMP
359360
"$env:RUNNER_TEMP\binaryen-version_$env:BINARYEN_VERSION\bin" | Out-File -FilePath $env:GITHUB_PATH -Append
360361
361-
cargo binstall --no-confirm --force cargo-about
362+
cargo binstall --no-confirm --force "cargo-about@$env:CARGO_ABOUT_VERSION"
362363
cargo binstall --no-confirm --force "wasm-bindgen-cli@$env:WASM_BINDGEN_CLI_VERSION"
363364
364365
- name: 🏗 Build Windows bundle
@@ -496,6 +497,7 @@ jobs:
496497
env:
497498
WASM_BINDGEN_CLI_VERSION: "0.2.121"
498499
BINARYEN_VERSION: "130"
500+
CARGO_ABOUT_VERSION: "0.9.0"
499501

500502
steps:
501503
- name: 📥 Clone repository
@@ -554,7 +556,7 @@ jobs:
554556
fi
555557
echo "$BINARYEN_DIR/bin" >> "$GITHUB_PATH"
556558
557-
cargo binstall --no-confirm --force cargo-about
559+
cargo binstall --no-confirm --force "cargo-about@${CARGO_ABOUT_VERSION}"
558560
cargo binstall --no-confirm --force "wasm-bindgen-cli@${WASM_BINDGEN_CLI_VERSION}"
559561
560562
- name: 🏗 Build Mac bundle

Cargo.lock

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

demo-artwork/changing-seasons.graphite

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

demo-artwork/isometric-fountain.graphite

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

demo-artwork/marbled-mandelbrot.graphite

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

demo-artwork/painted-dreams.graphite

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

demo-artwork/parametric-dunescape.graphite

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

demo-artwork/procedural-string-lights.graphite

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

demo-artwork/red-dress.graphite

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

demo-artwork/valley-of-spires.graphite

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)