Skip to content

Commit 167c22b

Browse files
committed
Merge main into ruby-gem.
2 parents 631882a + 8aa4928 commit 167c22b

39 files changed

+899
-117
lines changed

.config/repo.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"$schema": "../node_modules/@lgarron-bin/repo/schemas/repo.json",
3+
"scripts": {
4+
"postVersion": ["./script/ruby-version/sync.ts"]
5+
}
6+
}

.github/workflows/CI.yaml

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ jobs:
3535
- uses: actions/checkout@v4
3636
- uses: ./.github/workflows/install-pinned-toolchains
3737
- uses: Swatinem/rust-cache@v2
38-
- run: make setup
3938
- run: make build-rust-wasm
4039
- run: make test-rust-wasm
4140

@@ -46,7 +45,6 @@ jobs:
4645
- uses: actions/checkout@v4
4746
- uses: ./.github/workflows/install-pinned-toolchains
4847
- uses: Swatinem/rust-cache@v2
49-
- run: make setup
5048
- run: make build-rust
5149
- run: make benchmark-rust
5250

@@ -56,9 +54,20 @@ jobs:
5654
steps:
5755
- uses: actions/checkout@v4
5856
- uses: ./.github/workflows/install-pinned-toolchains
59-
- run: make setup
6057
- run: make lint-js
6158

59+
ruby:
60+
runs-on: ubuntu-latest
61+
62+
steps:
63+
- uses: actions/checkout@v4
64+
- uses: ./.github/workflows/install-pinned-toolchains
65+
# TODO: XDG conventions 😕
66+
- run: echo "$HOME/.cargo/bin" >> "$GITHUB_PATH"
67+
- run: make setup-ruby
68+
- run: make test-ruby
69+
- run: make lint-ruby
70+
6271
build-x86_64-apple-darwin:
6372
runs-on: macos-latest
6473
steps:

.github/workflows/install-pinned-toolchains/action.yaml

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,16 @@ description: "Install pinned toolchains"
44
runs:
55
using: "composite"
66
steps:
7-
# We don't install rust here becasue `cargo` is pre-installed and `rust-toolchain.toml` handles the rest.
8-
# We don't install a specific C++ compiler here because the default in the GH Actions runner works for us.
9-
- uses: actions/checkout@v4
10-
with:
7+
# We don't install Rust here because `cargo` is pre-installed and `rust-toolchain.toml` handles the rest.
8+
- uses: actions/checkout@v4
9+
with:
1110
fetch-depth: 0 # needed for tags for `git describe --tags`
12-
- uses: actions/setup-node@v4
13-
with:
14-
node-version: 22.3.0
15-
- uses: oven-sh/setup-bun@v2
16-
with:
17-
bun-version: 1.2.7
11+
- uses: actions/setup-node@v4
12+
with:
13+
node-version: 22.3.0
14+
- uses: oven-sh/setup-bun@v2
15+
with:
16+
bun-version: 1.2.7
17+
- shell: bash
18+
# We don't need this for all the jobs, but it's wicked fast to just download the binary and allows us to avoid hacks for the engine version checks.
19+
run: ./script/install-rv-for-ci.ts

.gitignore

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,3 @@
1212
# These are no longer produced, but we want to avoid commmiting them,
1313
# in case they get left in the top dir around after testing old commits.
1414
/package-lock.json
15-
16-
# Temporary ignores for dev.
17-
/src/ruby-gem

.vscode/extensions.json

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
11
{
2-
"recommendations": ["rust-lang.rust-analyzer", "biomejs.biome"]
2+
"recommendations": [
3+
"rust-lang.rust-analyzer",
4+
"biomejs.biome",
5+
"Shopify.ruby-lsp"
6+
]
37
}

.vscode/settings.json

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,13 @@
77
},
88
"[json]": {
99
"editor.defaultFormatter": "biomejs.biome"
10-
}
10+
},
11+
"[ruby]": {
12+
"editor.defaultFormatter": "Shopify.ruby-lsp"
13+
},
14+
"rubyLsp.rubyVersionManager": {
15+
"identifier": "rv"
16+
},
17+
"rubyLsp.bundleGemfile": "./src/ruby-gem/Gemfile",
18+
"rubyLsp.formatter": "rubocop"
1119
}

Cargo.lock

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

Cargo.toml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,13 @@
11
[workspace]
22
resolver = "2"
3-
members = ["src/lib", "src/cli", "src/ffi", "src/wasm", "script/cargo-run-bin"]
3+
members = [
4+
"src/lib",
5+
"src/cli",
6+
"src/ffi",
7+
"src/ruby-gem/ext/twips",
8+
"src/wasm",
9+
"script/cargo-run-bin",
10+
]
411
default-members = ["src/cli"]
512

613
[workspace.package]

0 commit comments

Comments
 (0)