Skip to content

Commit 6b8fa90

Browse files
authored
Merge branch 'master' into tyler/update-nativeaot-llvm-infrastructure
2 parents 9316256 + afd3f35 commit 6b8fa90

495 files changed

Lines changed: 22301 additions & 24591 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/ci.yml

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -238,6 +238,30 @@ jobs:
238238
./emsdk install 4.0.21
239239
./emsdk activate 4.0.21
240240
241+
- name: Install wasm-bindgen CLI
242+
run: |
243+
REQUIRED_WASM_BINDGEN_VERSION="$(
244+
awk '
245+
$1 == "name" && $3 == "\"wasm-bindgen\"" { in_pkg = 1; next }
246+
in_pkg && $1 == "version" {
247+
gsub(/"/, "", $3);
248+
print $3;
249+
exit;
250+
}
251+
' Cargo.lock
252+
)"
253+
if [ -z "${REQUIRED_WASM_BINDGEN_VERSION}" ]; then
254+
echo "Failed to determine wasm-bindgen version from Cargo.lock"
255+
exit 1
256+
fi
257+
258+
INSTALLED_WASM_BINDGEN_VERSION="$(wasm-bindgen --version 2>/dev/null | awk '{print $2}' || true)"
259+
if [ "${INSTALLED_WASM_BINDGEN_VERSION}" != "${REQUIRED_WASM_BINDGEN_VERSION}" ]; then
260+
cargo install --locked --force wasm-bindgen-cli --version "${REQUIRED_WASM_BINDGEN_VERSION}"
261+
fi
262+
263+
wasm-bindgen --version
264+
241265
- name: Build typescript module sdk
242266
working-directory: crates/bindings-typescript
243267
run: pnpm build

.github/workflows/pr_approval_check.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,9 @@ jobs:
3030
publish-approval-status:
3131
name: Set approval status
3232
runs-on: ubuntu-latest
33+
# Disabled until we can spend some more focus on making this work consistently.
34+
# See https://github.com/clockworklabs/SpacetimeDB/pull/4673.
35+
if: false
3336

3437
# SECURITY: Do not add a checkout step to this job. See comment at the top of this file.
3538
steps:

0 commit comments

Comments
 (0)