Skip to content

Commit 70a2dcf

Browse files
balegasclaude
andcommitted
chore(durable-streams-server): rename folder, drop Intel macOS build, fix README
Rename packages/server-rust -> packages/durable-streams-server (npm package name, crate name, and binary name are unchanged, so publishing is unaffected). Update all path references in CI workflows, Dockerfile, npm templates, and the lockfile importer key. Drop the x86_64-apple-darwin (macos-13) leg from the publish build matrix: the scarce Intel macOS runner pool stalls releases, and its binary only feeds the disabled npm packages. Fix the README write-throughput figure (0.86M -> 860,000 append/s) and remove the per-stream results table. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
1 parent 7023ec0 commit 70a2dcf

43 files changed

Lines changed: 99 additions & 97 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
---
2+
'@electric-ax/durable-streams-server-rust': patch
3+
---
4+
5+
Rename the package folder to `packages/durable-streams-server`. Drop the Intel
6+
macOS (`macos-13`) build from the release matrix. Correct the README throughput
7+
figure.

.github/workflows/changesets_release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ jobs:
9999
# across unrelated releases that leave the server-rust version unchanged),
100100
# and correct on the first run. The crate version is synced to this anchor
101101
# at publish time by sync-cargo-version.mjs.
102-
VERSION="$(node -p "require('./packages/server-rust/package.json').version")"
102+
VERSION="$(node -p "require('./packages/durable-streams-server/package.json').version")"
103103
if curl -sf -H 'User-Agent: electric-sql-release-ci' "https://crates.io/api/v1/crates/durable-streams/$VERSION" >/dev/null 2>&1; then
104104
echo "needs_release=false" >> "$GITHUB_OUTPUT"
105105
else

.github/workflows/server_rust_dockerhub_image.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77
# push:
88
# branches: ['main']
99
# paths:
10-
# - 'packages/server-rust/**'
10+
# - 'packages/durable-streams-server/**'
1111
# Called by the Changesets release workflow after a version bump.
1212
workflow_call:
1313
inputs:
@@ -76,7 +76,7 @@ jobs:
7676
run: |
7777
# The crate version lives in the package.json anchor (changeset-managed),
7878
# which is private — so there is no git tag to describe; read it directly.
79-
VERSION=$(node -p "require('./packages/server-rust/package.json').version")
79+
VERSION=$(node -p "require('./packages/durable-streams-server/package.json').version")
8080
8181
if [ -n "$INPUT_DOCKER_TAG" ]; then
8282
IMAGE_TAGS="${DOCKERHUB_REPO}:${INPUT_DOCKER_TAG}"
@@ -105,5 +105,5 @@ jobs:
105105
image_repo: electricax/durable-streams-server-rust
106106
artifact_prefix: durable-streams-server-rust
107107
context: .
108-
file: packages/server-rust/Dockerfile
108+
file: packages/durable-streams-server/Dockerfile
109109
tags: ${{ needs.derive_build_vars.outputs.image_tags }}

.github/workflows/server_rust_publish.yml

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ name: Publish durable-streams-server-rust (npm + crates.io)
44
# Publishes the binary npm packages (main + 4 platform) and the crate. The Docker
55
# image is published separately by server_rust_dockerhub_image.yml.
66
#
7-
# The version is read from packages/server-rust/package.json (the changeset-managed
7+
# The version is read from packages/durable-streams-server/package.json (the changeset-managed
88
# anchor, `private: true` so changesets bumps it but does not publish it). Both
99
# registries use OIDC Trusted Publishing — no tokens (one-time setup required on
1010
# crates.io and npm before the first release).
@@ -42,11 +42,13 @@ jobs:
4242
target: aarch64-unknown-linux-gnu,
4343
os: blacksmith-4vcpu-ubuntu-2404-arm,
4444
}
45-
- { target: x86_64-apple-darwin, os: macos-13 }
45+
# x86_64-apple-darwin (macos-13, Intel) is disabled: the scarce Intel
46+
# macOS runner pool stalls the release, and its binary only feeds the
47+
# currently-disabled npm packages. Re-add alongside re-enabling npm.
4648
- { target: aarch64-apple-darwin, os: macos-latest }
4749
defaults:
4850
run:
49-
working-directory: packages/server-rust
51+
working-directory: packages/durable-streams-server
5052
steps:
5153
- uses: actions/checkout@v4
5254
with:
@@ -58,7 +60,7 @@ jobs:
5860

5961
- uses: Swatinem/rust-cache@v2
6062
with:
61-
workspaces: packages/server-rust
63+
workspaces: packages/durable-streams-server
6264

6365
- name: Build
6466
run: cargo build --release --locked --target ${{ matrix.target }}
@@ -81,7 +83,7 @@ jobs:
8183
uses: actions/upload-artifact@v4
8284
with:
8385
name: bin-${{ matrix.target }}
84-
path: packages/server-rust/target/${{ matrix.target }}/release/durable-streams-server
86+
path: packages/durable-streams-server/target/${{ matrix.target }}/release/durable-streams-server
8587
if-no-files-found: error
8688

8789
cargo-publish:
@@ -93,15 +95,15 @@ jobs:
9395
ref: ${{ inputs.git_ref }}
9496
- uses: dtolnay/rust-toolchain@stable
9597
- name: Sync Cargo.toml version from the package.json anchor
96-
run: node packages/server-rust/scripts/sync-cargo-version.mjs
98+
run: node packages/durable-streams-server/scripts/sync-cargo-version.mjs
9799
- name: Authenticate to crates.io (Trusted Publishing, OIDC)
98100
uses: rust-lang/crates-io-auth-action@v1
99101
id: auth
100102
- name: cargo publish
101103
env:
102104
CARGO_REGISTRY_TOKEN: ${{ steps.auth.outputs.token }}
103105
# --allow-dirty: sync-cargo-version edited Cargo.toml in the working tree.
104-
run: cargo publish --allow-dirty --manifest-path packages/server-rust/Cargo.toml
106+
run: cargo publish --allow-dirty --manifest-path packages/durable-streams-server/Cargo.toml
105107

106108
npm-publish:
107109
needs: build
@@ -135,8 +137,8 @@ jobs:
135137
done
136138
- name: Assemble npm packages
137139
run: |
138-
version="$(node -p "require('./packages/server-rust/package.json').version")"
139-
node packages/server-rust/npm/assemble.mjs \
140+
version="$(node -p "require('./packages/durable-streams-server/package.json').version")"
141+
node packages/durable-streams-server/npm/assemble.mjs \
140142
--version "$version" \
141143
--bins "$RUNNER_TEMP/arranged" \
142144
--out "$RUNNER_TEMP/npm-dist"

.github/workflows/server_rust_tests.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ on:
44
push:
55
branches: ['main']
66
paths:
7-
- 'packages/server-rust/**'
7+
- 'packages/durable-streams-server/**'
88
- '.github/workflows/server_rust_tests.yml'
99
pull_request:
1010
paths:
11-
- 'packages/server-rust/**'
11+
- 'packages/durable-streams-server/**'
1212
- '.github/workflows/server_rust_tests.yml'
1313

1414
permissions:
@@ -24,7 +24,7 @@ jobs:
2424
runs-on: blacksmith-4vcpu-ubuntu-2404
2525
defaults:
2626
run:
27-
working-directory: packages/server-rust
27+
working-directory: packages/durable-streams-server
2828
steps:
2929
- uses: actions/checkout@v4
3030

@@ -34,7 +34,7 @@ jobs:
3434

3535
- uses: Swatinem/rust-cache@v2
3636
with:
37-
workspaces: packages/server-rust
37+
workspaces: packages/durable-streams-server
3838

3939
- name: Build
4040
run: cargo build --release
@@ -49,7 +49,7 @@ jobs:
4949
uses: actions/upload-artifact@v4
5050
with:
5151
name: durable-streams-server
52-
path: packages/server-rust/target/release/durable-streams-server
52+
path: packages/durable-streams-server/target/release/durable-streams-server
5353
retention-days: 1
5454

5555
conformance:
@@ -82,10 +82,10 @@ jobs:
8282
uses: actions/download-artifact@v4
8383
with:
8484
name: durable-streams-server
85-
path: packages/server-rust/target/release
85+
path: packages/durable-streams-server/target/release
8686

8787
- name: Make binary executable
88-
run: chmod +x packages/server-rust/target/release/durable-streams-server
88+
run: chmod +x packages/durable-streams-server/target/release/durable-streams-server
8989

9090
- name: Run conformance (${{ matrix.config.name }})
9191
env:
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)