Skip to content

Commit 1459374

Browse files
committed
Merge remote-tracking branch 'origin/master' into noa/bump-rust-1.87
2 parents d5b39ad + 380acf1 commit 1459374

141 files changed

Lines changed: 5991 additions & 3995 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/benchmarks.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ jobs:
177177
name: run callgrind benchmarks
178178
# DON'T run on benchmarks-runner, using docker on a self-hosted runner has
179179
# been broken for 4 years: https://github.com/actions/runner/issues/434 .
180-
# Fortunately, we can run on standard Github Actions infra because we don't care
180+
# Fortunately, we can run on standard GitHub Actions infra because we don't care
181181
# about other stuff running on the machine!
182182
# runs-on: benchmarks-runner
183183
runs-on: ubuntu-latest
@@ -236,7 +236,7 @@ jobs:
236236
# summary PR" step). otherwise, we can use a fully shallow checkout
237237
fetch-depth: ${{ env.PR_NUMBER && 1 || 2 }}
238238

239-
- name: Unbork Github Actions state
239+
- name: Unbork GitHub Actions state
240240
shell: bash
241241
run: |
242242
echo "Letting anybody touch our git repo, in order to avoid breaking other jobs"

.github/workflows/ci.yml

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -213,11 +213,20 @@ jobs:
213213
- uses: dsherret/rust-toolchain-file@v1
214214
- run: echo ::add-matcher::.github/workflows/rust_matcher.json
215215

216+
# Make sure the `Cargo.lock` file reflects the latest available versions.
217+
# This is what users would end up with on a fresh module, so we want to
218+
# catch any compile errors arising from a different transitive closure
219+
# of dependencies than what is in the workspace lock file.
220+
#
221+
# For context see also: https://github.com/clockworklabs/SpacetimeDB/pull/2714
222+
- name: Update dependencies
223+
run: cargo update
224+
216225
- name: Build module-test
217226
run: cargo run -p spacetimedb-cli -- build --project-path modules/module-test
218227

219228
- name: Run bindgen tests
220-
run: cargo test -p spacetimedb-cli
229+
run: cargo test -p spacetimedb-codegen
221230

222231
publish_checks:
223232
name: Check that packages are publishable

.github/workflows/contributor_check.yml

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

Cargo.lock

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

0 commit comments

Comments
 (0)