Skip to content

Commit f307f18

Browse files
jsjgdhjsjgdh
committed
Merge branch 'master' into svg-marker-node
2 parents b6afafa + bbbe049 commit f307f18

251 files changed

Lines changed: 10366 additions & 5686 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.

‎.branding‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
https://github.com/Keavon/graphite-branded-assets/archive/1509880500e32cb21235343ba865adcf0579133f.tar.gz
2-
89b4c58aee186b0c1610a8778bd199c9bdaf1191b4006e6b007dc40a402f4aa7
1+
https://github.com/Keavon/graphite-branded-assets/archive/0d004aa61e6b48d316e8e5db6d59ccc4788f192d.tar.gz
2+
772d64518be43c99977ba56f69e574531c56e83d2df2f42ab066f77f74b0dd1f

‎.cargo/config.toml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
[build]
2+
# Keep `--cfg=web_sys_unstable_apis` here so the wasm wrapper crates build with the same web-sys API signatures (e.g. `put_image_data`/`get_image_data` taking `i32` rather than `f64`) on both native test builds and the wasm target. Cargo applies `[build]` rustflags only when no target-specific rustflags table matches, so the wasm-specific list below must continue to include this cfg.
3+
rustflags = ["--cfg=web_sys_unstable_apis"]
4+
15
[target.wasm32-unknown-unknown]
26
rustflags = [
37
# Currently disabled because of https://github.com/GraphiteEditor/Graphite/issues/1262

‎.devcontainer/devcontainer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
},
77
"ghcr.io/devcontainers/features/node:1": {}
88
},
9-
"onCreateCommand": "cargo install cargo-watch wasm-pack cargo-about && cargo install -f wasm-bindgen-cli@0.2.100",
9+
"onCreateCommand": "cargo install cargo-watch wasm-pack cargo-about && cargo install -f wasm-bindgen-cli@0.2.121",
1010
"customizations": {
1111
"vscode": {
1212
// NOTE: Keep this in sync with `.vscode/extensions.json`

‎.github/workflows/build.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ jobs:
123123
DELAY=15
124124
for ATTEMPT in $(seq 1 $MAX_ATTEMPTS); do
125125
echo "Attempt $ATTEMPT of $MAX_ATTEMPTS..."
126-
npx wrangler@3 pages deploy "frontend/dist" --project-name="${{ steps.production-env.outputs.cf_project || 'graphite-dev' }}" --commit-dirty=true 2>&1 | tee /tmp/wrangler_output
126+
npx wrangler@3 pages deploy "frontend/dist" --project-name="${{ steps.production-env.outputs.cf_project || 'graphite-dev' }}" --branch="master" --commit-dirty=true 2>&1 | tee /tmp/wrangler_output
127127
if [ ${PIPESTATUS[0]} -eq 0 ]; then
128128
URL=$(grep -oP 'https://[^\s]+\.pages\.dev' /tmp/wrangler_output | head -1)
129129
echo "url=$URL" >> "$GITHUB_OUTPUT"
@@ -283,7 +283,7 @@ jobs:
283283
pull-requests: write
284284

285285
env:
286-
WASM_BINDGEN_CLI_VERSION: "0.2.100"
286+
WASM_BINDGEN_CLI_VERSION: "0.2.121"
287287

288288
steps:
289289
- name: 📥 Clone repository
@@ -474,7 +474,7 @@ jobs:
474474
pull-requests: write
475475

476476
env:
477-
WASM_BINDGEN_CLI_VERSION: "0.2.100"
477+
WASM_BINDGEN_CLI_VERSION: "0.2.121"
478478

479479
steps:
480480
- name: 📥 Clone repository

‎.github/workflows/check.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,8 @@ jobs:
5757

5858
- name: 🧪 Run Rust tests
5959
env:
60-
RUSTFLAGS: -Dwarnings
60+
# `--cfg=web_sys_unstable_apis` mirrors the `[build]` section of `.cargo/config.toml`
61+
RUSTFLAGS: "-Dwarnings --cfg=web_sys_unstable_apis"
6162
run: mold -run cargo test --all-features
6263

6364
# Rust format check on GitHub runner

‎.github/workflows/comment-profiling-changes.yaml‎

Lines changed: 13 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -22,27 +22,14 @@ jobs:
2222
- name: Install Rust
2323
uses: dtolnay/rust-toolchain@stable
2424

25-
- name: Install Valgrind
26-
run: |
27-
sudo apt update
28-
sudo apt install -y valgrind
29-
3025
- name: Cache Rust dependencies
3126
uses: Swatinem/rust-cache@v2
3227
with:
3328
# Cache on Cargo.lock file
3429
cache-on-failure: true
3530

36-
- name: Cache iai-callgrind binary
37-
id: cache-iai
38-
uses: actions/cache@v5
39-
with:
40-
path: ~/.cargo/bin/iai-callgrind-runner
41-
key: ${{ runner.os }}-iai-callgrind-runner-0.16.1
42-
43-
- name: Install iai-callgrind
44-
if: steps.cache-iai.outputs.cache-hit != 'true'
45-
run: cargo install iai-callgrind-runner@0.16.1
31+
- name: Install gungraun-runner and valgrind
32+
uses: gungraun/setup-gungraun@v1
4633

4734
- name: Checkout master branch
4835
run: |
@@ -66,34 +53,34 @@ jobs:
6653
id: cache-benchmark-baselines
6754
uses: actions/cache@v5
6855
with:
69-
path: target/iai
70-
key: ${{ runner.os }}-${{ runner.arch }}-${{ steps.cpu-info.outputs.cpu-hash }}-benchmark-baselines-master-${{ steps.master-sha.outputs.sha }}
56+
path: target/gungraun
57+
key: ${{ runner.os }}-${{ runner.arch }}-${{ steps.cpu-info.outputs.cpu-hash }}-gungraun-benchmark-baselines-master-${{ steps.master-sha.outputs.sha }}
7158
restore-keys: |
72-
${{ runner.os }}-${{ runner.arch }}-${{ steps.cpu-info.outputs.cpu-hash }}-benchmark-baselines-master-
59+
${{ runner.os }}-${{ runner.arch }}-${{ steps.cpu-info.outputs.cpu-hash }}-gungraun-benchmark-baselines-master-
7360
7461
- name: Run baseline benchmarks
7562
if: steps.cache-benchmark-baselines.outputs.cache-hit != 'true'
7663
run: |
7764
# Compile benchmarks
78-
cargo bench --bench compile_demo_art_iai -- --save-baseline=master
65+
cargo bench --bench compile_demo_art_gungraun -- --save-baseline=master
7966
8067
# Runtime benchmarks
81-
cargo bench --bench update_executor_iai -- --save-baseline=master
82-
cargo bench --bench run_once_iai -- --save-baseline=master
83-
cargo bench --bench run_cached_iai -- --save-baseline=master
68+
cargo bench --bench update_executor_gungraun -- --save-baseline=master
69+
cargo bench --bench run_once_gungraun -- --save-baseline=master
70+
cargo bench --bench run_cached_gungraun -- --save-baseline=master
8471
8572
- name: Checkout PR branch
8673
run: git checkout ${{ github.event.pull_request.head.sha }}
8774

8875
- name: Run PR benchmarks
8976
run: |
9077
# Compile benchmarks
91-
cargo bench --bench compile_demo_art_iai -- --baseline=master --output-format=json | jq -sc | sed 's/\\"//g' > /tmp/compile_output.json
78+
cargo bench --bench compile_demo_art_gungraun -- --baseline=master --output-format=json | jq -sc | sed 's/\\"//g' > /tmp/compile_output.json
9279
9380
# Runtime benchmarks
94-
cargo bench --bench update_executor_iai -- --baseline=master --output-format=json | jq -sc | sed 's/\\"//g' > /tmp/update_output.json
95-
cargo bench --bench run_once_iai -- --baseline=master --output-format=json | jq -sc | sed 's/\\"//g' > /tmp/run_once_output.json
96-
cargo bench --bench run_cached_iai -- --baseline=master --output-format=json | jq -sc | sed 's/\\"//g' > /tmp/run_cached_output.json
81+
cargo bench --bench update_executor_gungraun -- --baseline=master --output-format=json | jq -sc | sed 's/\\"//g' > /tmp/update_output.json
82+
cargo bench --bench run_once_gungraun -- --baseline=master --output-format=json | jq -sc | sed 's/\\"//g' > /tmp/run_once_output.json
83+
cargo bench --bench run_cached_gungraun -- --baseline=master --output-format=json | jq -sc | sed 's/\\"//g' > /tmp/run_cached_output.json
9784
9885
- name: Make old comments collapsed by default
9986
# Only run if we have write permissions (not a fork)

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,4 @@ flamegraph.svg
1212
.idea/
1313
.direnv
1414
.DS_Store
15+
.nvim.lua

‎.nix/dev.nix‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ pkgs.mkShell (
2929
pkgs.lld
3030
pkgs.nodejs
3131
pkgs.binaryen
32-
pkgs.wasm-bindgen-cli_0_2_100
32+
pkgs.wasm-bindgen-cli_0_2_121
3333
pkgs.wasm-pack
3434
pkgs.cargo-about
3535

‎.nix/pkgs/graphite-cef.nix‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{ pkgs, ... }:
22

33
let
4-
version = "147.0.10+gd58e84d+chromium-147.0.7727.118";
4+
version = "147.0.14+g76d2442+chromium-147.0.7727.138";
55
hashes = {
6-
aarch64-linux = "sha256-kaRijMDacPcoeCcS31zmRSNOvgozx+uq2M34mD28bu4=";
7-
x86_64-linux = "sha256-CHzPofBDhCniDZEpOxXK4I7p57SYjMAY1HVo3Vna0e8=";
6+
aarch64-linux = "sha256-Gy2Xs1NHwmIr+buzoqDso1QJVkKlA/UMXytHjNGqpNk=";
7+
x86_64-linux = "sha256-os7wAFJ+mVK65HCikvEjhMeQUj2ty7y+6Ad0OlOcbeA=";
88
};
99

1010
selectSystem =

‎.nix/pkgs/graphite.nix‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ deps.crane.lib.buildPackage (
8383
pkgs.lld
8484
pkgs.nodejs
8585
pkgs.binaryen
86-
pkgs.wasm-bindgen-cli_0_2_100
86+
pkgs.wasm-bindgen-cli_0_2_121
8787
pkgs.wasm-pack
8888
pkgs.cargo-about
8989
pkgs.removeReferencesTo

0 commit comments

Comments
 (0)