Skip to content

Commit 7685cee

Browse files
committed
Merge branch 'main' into blobs-1g-test
# Conflicts: # Cargo.lock
2 parents 004eaa5 + f9d3ae1 commit 7685cee

27 files changed

+1013
-265
lines changed

.github/workflows/ci.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ env:
1616
RUST_BACKTRACE: 1
1717
RUSTFLAGS: -Dwarnings
1818
RUSTDOCFLAGS: -Dwarnings
19-
MSRV: "1.76"
19+
MSRV: "1.81"
2020
SCCACHE_CACHE_SIZE: "50G"
2121
IROH_FORCE_STAGING_RELAYS: "1"
2222

@@ -204,7 +204,7 @@ jobs:
204204
- uses: actions/checkout@v4
205205
- uses: dtolnay/rust-toolchain@master
206206
with:
207-
toolchain: nightly-2024-05-02
207+
toolchain: nightly-2024-11-30
208208
- name: Install sccache
209209
uses: mozilla-actions/[email protected]
210210

.github/workflows/docs.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
- uses: actions/checkout@v4
3333
- uses: dtolnay/rust-toolchain@master
3434
with:
35-
toolchain: nightly-2024-05-02
35+
toolchain: nightly-2024-11-30
3636
- name: Install sccache
3737
uses: mozilla-actions/[email protected]
3838

@@ -68,6 +68,6 @@ jobs:
6868
comment-id: ${{ steps.fc.outputs.comment-id }}
6969
body: |
7070
Documentation for this PR has been generated and is available at: https://${{ github.repository_owner }}.github.io/${{ github.event.repository.name }}/${{ env.PREVIEW_PATH }}/iroh_blobs/
71-
71+
7272
Last updated: ${{ env.TIMESTAMP }}
7373
edit-mode: replace

0 commit comments

Comments
 (0)