Skip to content

Commit 90a665b

Browse files
authored
Merge branch 'master' into sdk-show-better-src-line-in-log
2 parents 1a168f0 + 080c501 commit 90a665b

735 files changed

Lines changed: 14170 additions & 1398 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/bottest.yml

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

.github/workflows/bottest_tracing_fix.patch

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

.github/workflows/ci.yml

Lines changed: 38 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -113,62 +113,6 @@ jobs:
113113
working-directory: crates/bindings-csharp
114114
run: dotnet test -warnaserror
115115

116-
sdk_test:
117-
name: SDK Tests
118-
runs-on: spacetimedb-runner
119-
steps:
120-
- name: Find Git ref
121-
env:
122-
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
123-
run: |
124-
PR_NUMBER="${{ github.event.inputs.pr_number || null }}"
125-
if test -n "${PR_NUMBER}"; then
126-
GIT_REF="$( gh pr view --repo clockworklabs/SpacetimeDB $PR_NUMBER --json headRefName --jq .headRefName )"
127-
else
128-
GIT_REF="${{ github.ref }}"
129-
fi
130-
echo "GIT_REF=${GIT_REF}" >>"$GITHUB_ENV"
131-
132-
- name: Checkout sources
133-
uses: actions/checkout@v4
134-
with:
135-
ref: ${{ env.GIT_REF }}
136-
137-
- uses: dsherret/rust-toolchain-file@v1
138-
139-
- uses: actions/setup-dotnet@v3
140-
with:
141-
global-json-file: modules/global.json
142-
143-
- name: Create /stdb dir
144-
run: |
145-
sudo mkdir /stdb
146-
sudo chmod 777 /stdb
147-
148-
- name: Checkout C# SDK
149-
uses: actions/checkout@v4
150-
with:
151-
repository: clockworklabs/spacetimedb-csharp-sdk
152-
ref: master
153-
path: spacetimedb-csharp-sdk
154-
155-
- name: Setup NuGet override for C# SDK
156-
working-directory: spacetimedb-csharp-sdk
157-
run: |
158-
dotnet pack ../crates/bindings-csharp/BSATN.Runtime
159-
# The SDK package overrides the following crate for use in their tests.
160-
# Even though it doesn't actually depend on it, we still need to pack it
161-
# so dotnet doesn't complain.
162-
dotnet pack ../crates/bindings-csharp/Runtime
163-
./tools~/write-nuget-config.sh ..
164-
165-
# clear package caches, so we get fresh ones even if version numbers haven't changed
166-
dotnet nuget locals all --clear
167-
168-
- name: Run C# SDK tests
169-
working-directory: spacetimedb-csharp-sdk
170-
run: dotnet test
171-
172116
lints:
173117
name: Lints
174118
runs-on: spacetimedb-runner
@@ -292,3 +236,41 @@ jobs:
292236
# happens very frequently on the `macos-runner`, but we haven't seen it on any others).
293237
cargo run --features github-token-auth --target ${{ matrix.target }} -p spacetimedb-update -- self-install --root-dir="${ROOT_DIR}" --yes
294238
"${ROOT_DIR}"/spacetime --root-dir="${ROOT_DIR}" help
239+
240+
cli_docs:
241+
name: Check CLI docs
242+
permissions: read-all
243+
runs-on: ubuntu-latest
244+
steps:
245+
- name: Find Git ref
246+
env:
247+
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
248+
shell: bash
249+
run: |
250+
PR_NUMBER="${{ github.event.inputs.pr_number || null }}"
251+
if test -n "${PR_NUMBER}"; then
252+
GIT_REF="$( gh pr view --repo clockworklabs/SpacetimeDB $PR_NUMBER --json headRefName --jq .headRefName )"
253+
else
254+
GIT_REF="${{ github.ref }}"
255+
fi
256+
echo "GIT_REF=${GIT_REF}" >>"$GITHUB_ENV"
257+
- name: Checkout sources
258+
uses: actions/checkout@v4
259+
with:
260+
ref: ${{ env.GIT_REF }}
261+
- uses: dsherret/rust-toolchain-file@v1
262+
- name: Check for docs change
263+
run: |
264+
cargo run --features markdown-docs -p spacetimedb-cli > docs/docs/cli-reference.md
265+
cd docs
266+
# This is needed because our website doesn't render markdown quite properly.
267+
# See the README in docs for more details.
268+
sed -i'' -E 's!^(##) `(.*)`$!\1 \2!' docs/cli-reference.md
269+
sed -i'' -E 's!^(######) \*\*(.*)\*\*$!\1 <b>\2</b>!' docs/cli-reference.md
270+
git status
271+
if git diff --exit-code HEAD; then
272+
echo "No docs changes detected"
273+
else
274+
echo "It looks like the CLI docs have changed:"
275+
exit 1
276+
fi

0 commit comments

Comments
 (0)