Skip to content

Commit fd5abbc

Browse files
authored
Fix nightly sdk compatibility build, again (#242)
The previous attempt to fix the nightly `latest-matrix-sdk-crypto` job failed, because the version of the rust-sdk in git was 0.12.0, whereas our Cargo.lock required 0.11.0. It seems like we have to edit the Cargo.toml. Editing a toml isn't something I want to do from a script, so I've made it an xtask.
1 parent 2f3ddcb commit fd5abbc

File tree

11 files changed

+552
-12
lines changed

11 files changed

+552
-12
lines changed

.cargo/config.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
[build]
2-
target = "wasm32-unknown-unknown"
1+
[alias]
2+
xtask = "run --manifest-path xtask/Cargo.toml --"
33

44
[target.wasm32-unknown-unknown]
55
rustflags = ['--cfg', 'getrandom_backend="wasm_js"']

.github/workflows/ci.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ jobs:
3636
- name: Check formatting
3737
run: |
3838
cargo fmt -- --check
39+
(cd xtask && cargo fmt -- --check)
3940
4041
- name: Install Node.js
4142
uses: actions/setup-node@v3

.github/workflows/latest-matrix-sdk-crypto.yml

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -53,16 +53,7 @@ jobs:
5353

5454
- name: Update to the latest matrix-sdk-crypto version
5555
run: |
56-
tee >> .cargo/config.toml << EOF
57-
[patch.crates-io]
58-
matrix-sdk-common = { git = "https://github.com/matrix-org/matrix-rust-sdk" }
59-
matrix-sdk-crypto = { git = "https://github.com/matrix-org/matrix-rust-sdk" }
60-
matrix-sdk-indexeddb = { git = "https://github.com/matrix-org/matrix-rust-sdk" }
61-
matrix-sdk-qrcode = { git = "https://github.com/matrix-org/matrix-rust-sdk" }
62-
matrix-sdk-store-encryption = { git = "https://github.com/matrix-org/matrix-rust-sdk" }
63-
EOF
64-
65-
cargo update matrix-sdk-crypto
56+
cargo xtask unstable-rust-sdk
6657
6758
- name: Install Node.js
6859
uses: actions/setup-node@v3

xtask/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/target

xtask/.idea/.gitignore

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

xtask/.idea/modules.xml

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

xtask/.idea/vcs.xml

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

xtask/.idea/xtask.iml

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

0 commit comments

Comments
 (0)