Skip to content

Commit 833d4e2

Browse files
authored
Merge branch 'unstable' into keep-execution-payload
2 parents e1f81ce + 2193f6a commit 833d4e2

File tree

268 files changed

+9819
-5577
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

268 files changed

+9819
-5577
lines changed

.cargo/config.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
[env]
22
# Set the number of arenas to 16 when using jemalloc.
33
JEMALLOC_SYS_WITH_MALLOC_CONF = "abort_conf:true,narenas:16"
4-

.github/workflows/book.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ concurrency:
1111

1212
jobs:
1313
build-and-upload-to-s3:
14-
runs-on: ubuntu-20.04
14+
runs-on: ubuntu-latest
1515
steps:
1616
- uses: actions/checkout@v4
1717

.github/workflows/test-suite.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,7 @@ jobs:
6565
- name: Install dependencies
6666
run: apt update && apt install -y cmake libclang-dev
6767
- name: Check for deadlocks
68-
run: |
69-
cargo lockbud -k deadlock -b -l tokio_util
68+
run: ./scripts/ci/check-lockbud.sh
7069

7170
target-branch-check:
7271
name: target-branch-check

0 commit comments

Comments
 (0)