Skip to content

Commit f7848e2

Browse files
authored
Merge branch 'master' into onx2/table-traits
2 parents 8171276 + 77ed3b1 commit f7848e2

1,799 files changed

Lines changed: 147676 additions & 71716 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.

.cargo/config.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
rustflags = ["--cfg", "tokio_unstable"]
33

44
[alias]
5-
bump-versions = "run -p upgrade-version --"
65
llm = "run --package xtask-llm-benchmark --bin llm_benchmark --"
76
ci = "run -p ci --"
7+
regen = "run -p regen --"
88
smoketest = "ci smoketests --"
99
smoketests = "smoketest"
1010
lint = "ci lint --"

.gitattributes

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
**/module_bindings/** linguist-generated=true eol=lf
2+
**/ModuleBindings/** linguist-generated=true eol=lf
23
/docs/llms/** linguist-generated=true
34
/docs/llms/*-details.json linguist-generated=false

.github/CODEOWNERS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ LICENSE.txt @cloutiertyler
77

88
/crates/cli/src/ @bfops @cloutiertyler @jdetter
99
/tools/ci/ @bfops @cloutiertyler @jdetter
10+
/tools/ci/src/keynote_bench.rs @joshua-spacetime @cloutiertyler @jdetter
1011
/tools/upgrade-version/ @bfops @jdetter @cloutiertyler
1112
/tools/license-check/ @bfops @jdetter @cloutiertyler
1213
/.github/ @bfops @jdetter @cloutiertyler
Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
name: Keynote Bench Setup
2+
description: Shared setup for the keynote benchmark job
3+
4+
inputs:
5+
public_root:
6+
description: Path to the public SpacetimeDB checkout in the caller workspace
7+
required: false
8+
default: .
9+
rust_cache_workspaces:
10+
description: Workspace paths passed to Swatinem/rust-cache
11+
required: true
12+
13+
runs:
14+
using: composite
15+
steps:
16+
- uses: dsherret/rust-toolchain-file@v1
17+
18+
- name: Set default rust toolchain
19+
shell: bash
20+
run: rustup default $(rustup show active-toolchain | cut -d' ' -f1)
21+
22+
- name: Cache Rust dependencies
23+
uses: Swatinem/rust-cache@v2
24+
with:
25+
workspaces: ${{ inputs.rust_cache_workspaces }}
26+
shared-key: spacetimedb
27+
save-if: false
28+
prefix-key: v1
29+
30+
- name: Check v8 outputs
31+
shell: bash
32+
run: |
33+
find "${CARGO_TARGET_DIR}"/ -type f | grep '[/_]v8' || true
34+
if ! [ -f "${CARGO_TARGET_DIR}"/release/gn_out/obj/librusty_v8.a ]; then
35+
echo "Could not find v8 output file librusty_v8.a; rebuilding manually."
36+
cargo clean --release -p v8 || true
37+
cargo build --release -p v8
38+
fi
39+
working-directory: ${{ inputs.public_root }}
40+
41+
- name: Build public keynote benchmark binaries
42+
shell: bash
43+
run: cargo build --release -p spacetimedb-cli -p spacetimedb-standalone
44+
working-directory: ${{ inputs.public_root }}
45+
46+
- name: Build TypeScript SDK
47+
shell: bash
48+
run: pnpm build
49+
working-directory: ${{ inputs.public_root }}/crates/bindings-typescript
Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
name: Set up pnpm
2+
description: Install pnpm and configure repository package-age policy before any install
3+
inputs:
4+
package_json_file:
5+
description: package.json file used to determine the pnpm version
6+
required: false
7+
default: package.json
8+
run_install:
9+
description: Run pnpm install after configuring pnpm
10+
required: false
11+
default: "false"
12+
working_directory:
13+
description: Directory to run pnpm install in
14+
required: false
15+
default: .
16+
runs:
17+
using: composite
18+
steps:
19+
- uses: pnpm/action-setup@v4
20+
with:
21+
package_json_file: ${{ inputs.package_json_file }}
22+
23+
- name: Configure pnpm package age policy
24+
shell: bash
25+
run: pnpm config set --global minimumReleaseAge 1440
26+
27+
- name: Install dependencies
28+
if: inputs.run_install == 'true'
29+
shell: bash
30+
working-directory: ${{ inputs.working_directory }}
31+
run: pnpm install

.github/docker-compose.yml

Lines changed: 0 additions & 15 deletions
This file was deleted.

.github/workflows/attach-artifacts.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ jobs:
1717
- name: Checkout
1818
uses: actions/checkout@v4
1919

20-
- name: Download artifacts from private base URL
20+
- name: Download artifacts from AWS base URL
2121
env:
2222
RELEASE_TAG: ${{ github.event.inputs.release_tag }}
23-
BASE_URL: ${{ secrets.ARTIFACT_BASE_URL }}
23+
BASE_URL: https://${{ vars.AWS_BUCKET }}.s3.amazonaws.com/refs/tags
2424
run: |
2525
set -euo pipefail
2626

.github/workflows/benchmarks.yml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ on:
22
push:
33
branches:
44
- master
5-
- jgilles/fix-callgrind-again
65

76
workflow_dispatch:
87
inputs:
@@ -24,8 +23,10 @@ jobs:
2423
benchmark:
2524
name: run criterion benchmarks
2625
runs-on: benchmarks-runner
26+
# disable until we fix the benchmarks
27+
if: false
2728
# filter for a comment containing 'benchmarks please'
28-
if: ${{ github.event_name != 'issue_comment' || (github.event.issue.pull_request && contains(github.event.comment.body, 'benchmarks please')) }}
29+
#if: ${{ github.event_name != 'issue_comment' || (github.event.issue.pull_request && contains(github.event.comment.body, 'benchmarks please')) }}
2930
env:
3031
PR_NUMBER: ${{ github.event.inputs.pr_number || github.event.issue.number || null }}
3132
steps:
@@ -185,8 +186,10 @@ jobs:
185186
container:
186187
image: rust:1.93.0
187188
options: --privileged
189+
# disable until we fix the benchmarks
190+
if: false
188191
# filter for a comment containing 'benchmarks please'
189-
if: ${{ github.event_name != 'issue_comment' || (github.event.issue.pull_request && contains(github.event.comment.body, 'benchmarks please')) }}
192+
#if: ${{ github.event_name != 'issue_comment' || (github.event.issue.pull_request && contains(github.event.comment.body, 'benchmarks please')) }}
190193
env:
191194
PR_NUMBER: ${{ github.event.inputs.pr_number || github.event.issue.number || null }}
192195
steps:

0 commit comments

Comments
 (0)