Skip to content

Commit fbfa917

Browse files
committed
Merge remote-tracking branch 'refs/remotes/origin/v2.0-dev' into feat/wasm-extra-fields
2 parents 9bf5f56 + cd1527d commit fbfa917

222 files changed

Lines changed: 7426 additions & 2672 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-release.toml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,10 @@
55
rustflags = ["-C", "target-feature=-crt-static"]
66

77
[target.x86_64-unknown-linux-musl]
8-
rustflags = ["-C", "target-feature=-crt-static"]
8+
rustflags = ["-C", "target-feature=-crt-static", "-C", "target-cpu=x86-64-v3"]
9+
10+
[target.x86_64-unknown-linux-gnu]
11+
rustflags = ["-C", "target-feature=-crt-static", "-C", "target-cpu=x86-64-v3"]
912

1013
[target.aarch64-unknown-linux-gnu]
1114
linker = "aarch64-linux-gnu-gcc"

.cargo/config.toml

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,24 @@
44
rustflags = ["-C", "target-feature=-crt-static", "--cfg", "tokio_unstable"]
55

66
[target.x86_64-unknown-linux-musl]
7-
rustflags = ["-C", "target-feature=-crt-static", "--cfg", "tokio_unstable"]
7+
rustflags = [
8+
"-C",
9+
"target-feature=-crt-static",
10+
"--cfg",
11+
"tokio_unstable",
12+
"-C",
13+
"target-cpu=x86-64",
14+
]
15+
16+
[target.x86_64-unknown-linux-gnu]
17+
rustflags = [
18+
"-C",
19+
"target-feature=-crt-static",
20+
"--cfg",
21+
"tokio_unstable",
22+
"-C",
23+
"target-cpu=x86-64",
24+
]
825

926
[target.aarch64-unknown-linux-gnu]
1027
linker = "aarch64-linux-gnu-gcc"

.devcontainer/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ RUN set -ex; \
6666
rm /tmp/cargo-binstall; \
6767
cargo binstall -V
6868
69-
RUN cargo binstall wasm-bindgen-cli@0.2.86 --locked \
69+
RUN cargo binstall wasm-bindgen-cli@0.2.99 --locked \
7070
--no-discover-github-token \
7171
--disable-telemetry \
7272
--no-track \

.github/actions/librocksdb/action.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ name: "librocksdb"
66
description: "Build and install librocksdb"
77
inputs:
88
version:
9-
description: RocksDB version, eg. "8.10.2"
9+
description: RocksDB version, eg. "9.9.3"
1010
required: false
11-
default: "8.10.2"
11+
default: "9.9.3"
1212
force:
1313
description: Force rebuild
1414
required: false

.github/workflows/release.yml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,14 +70,20 @@ jobs:
7070
if: ${{ steps.check-artifact.outputs.exists != 'true' }}
7171

7272
- name: Install wasm-bindgen-cli
73-
run: cargo binstall wasm-bindgen-cli@0.2.86
73+
run: cargo binstall wasm-bindgen-cli@0.2.99
74+
if: ${{ steps.check-artifact.outputs.exists != 'true' }}
75+
76+
- name: Install Binaryen
77+
run: |
78+
wget https://github.com/WebAssembly/binaryen/releases/download/version_121/binaryen-version_121-x86_64-linux.tar.gz -P /tmp
79+
tar -xzf /tmp/binaryen-version_121-x86_64-linux.tar.gz -C /tmp
80+
sudo cp -r /tmp/binaryen-version_121/* /usr/local/
7481
if: ${{ steps.check-artifact.outputs.exists != 'true' }}
7582

7683
- name: Build packages
7784
run: yarn build
7885
env:
7986
CARGO_BUILD_PROFILE: release
80-
8187
if: ${{ steps.check-artifact.outputs.exists != 'true' }}
8288

8389
- name: Set suffix

.github/workflows/tests-build-js.yml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,14 @@ jobs:
5050
if: ${{ steps.check-artifact.outputs.exists != 'true' }}
5151

5252
- name: Install wasm-bindgen-cli
53-
run: cargo binstall wasm-bindgen-cli@0.2.86
53+
run: cargo binstall wasm-bindgen-cli@0.2.99
54+
if: ${{ steps.check-artifact.outputs.exists != 'true' }}
55+
56+
- name: Install Binaryen
57+
run: |
58+
wget https://github.com/WebAssembly/binaryen/releases/download/version_121/binaryen-version_121-x86_64-linux.tar.gz -P /tmp
59+
tar -xzf /tmp/binaryen-version_121-x86_64-linux.tar.gz -C /tmp
60+
sudo cp -r /tmp/binaryen-version_121/* /usr/local/
5461
if: ${{ steps.check-artifact.outputs.exists != 'true' }}
5562

5663
- name: Build JS packages

.pnp.cjs

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
23.2 KB
Binary file not shown.
Binary file not shown.
Binary file not shown.

0 commit comments

Comments
 (0)