Skip to content

Commit 7a777b5

Browse files
authored
Merge branch 'main' into feat/muxed_keys
2 parents eced1d2 + 715a200 commit 7a777b5

File tree

35 files changed

+728
-172
lines changed

35 files changed

+728
-172
lines changed

.github/workflows/rust.yml

+14-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717

1818
complete:
1919
if: always()
20-
needs: [fmt, check-generated-full-help-docs, build-and-test, publish-dry-run]
20+
needs: [fmt, cargo-deny, check-generated-full-help-docs, build-and-test, publish-dry-run]
2121
runs-on: ubuntu-latest
2222
steps:
2323
- if: contains(needs.*.result, 'failure') || contains(needs.*.result, 'cancelled')
@@ -30,6 +30,19 @@ jobs:
3030
- run: rustup update
3131
- run: cargo fmt --all --check
3232

33+
cargo-deny:
34+
runs-on: ubuntu-latest
35+
strategy:
36+
fail-fast: false
37+
matrix:
38+
check: [advisories, bans, licenses, sources]
39+
continue-on-error: ${{ matrix.check == 'advisories' || matrix.check == 'bans' || matrix.check == 'licenses' }}
40+
steps:
41+
- uses: actions/checkout@v3
42+
- uses: EmbarkStudios/cargo-deny-action@b01e7a8cfb1f496c52d77361e84c1840d8246393
43+
with:
44+
command: check ${{ matrix.check }}
45+
3346
check-generated-full-help-docs:
3447
runs-on: ubuntu-latest-16-cores
3548
steps:

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,4 @@ test_snapshots
88
.vscode/settings.json
99
.idea
1010
local.sh
11+
.stellar

Cargo.lock

+38-37
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

+6-8
Original file line numberDiff line numberDiff line change
@@ -19,24 +19,24 @@ exclude = [
1919
]
2020

2121
[workspace.package]
22-
version = "21.5.0"
22+
version = "22.0.0-rc.1"
2323
rust-version = "1.81.0"
2424

2525
# Dependencies located in this repo:
2626
[workspace.dependencies.soroban-cli]
27-
version = "=21.5.0"
27+
version = "=22.0.0-rc.1"
2828
path = "cmd/soroban-cli"
2929

3030
[workspace.dependencies.soroban-spec-json]
31-
version = "=21.5.0"
31+
version = "=22.0.0-rc.1"
3232
path = "./cmd/crates/soroban-spec-json"
3333

3434
[workspace.dependencies.soroban-spec-typescript]
35-
version = "21.5.0"
35+
version = "22.0.0-rc.1"
3636
path = "./cmd/crates/soroban-spec-typescript"
3737

3838
[workspace.dependencies.soroban-spec-tools]
39-
version = "21.5.0"
39+
version = "22.0.0-rc.1"
4040
path = "./cmd/crates/soroban-spec-tools"
4141

4242
# Dependencies from the rs-stellar-xdr repo:
@@ -63,9 +63,7 @@ version = "=22.0.0-rc.3"
6363
# Dependencies from the rs-stellar-rpc-client repo:
6464
[workspace.dependencies.soroban-rpc]
6565
package = "stellar-rpc-client"
66-
version = "21.4.0"
67-
git = "https://github.com/stellar/rs-stellar-rpc-client"
68-
rev = "7554d4c87c026313a1f5b3c7ae66a92b5ff7e091"
66+
version = "=22.0.0-rc.1"
6967

7068
# Dependencies from elsewhere shared by crates:
7169
[workspace.dependencies]

0 commit comments

Comments
 (0)