Skip to content

Commit

Permalink
deps and msrv fix
Browse files Browse the repository at this point in the history
  • Loading branch information
dignifiedquire committed May 12, 2024
1 parent f941ec4 commit 4fb2ccf
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 20 deletions.
36 changes: 18 additions & 18 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:
env:
RUST_BACKTRACE: 1
RUSTFLAGS: -Dwarnings
MSRV: "1.67"
MSRV: "1.70"


jobs:
Expand All @@ -31,13 +31,13 @@ jobs:
uses: dtolnay/rust-toolchain@master
with:
toolchain: ${{ matrix.rust }}

- name: check
run: cargo check --all --bins --tests

- name: tests
run: cargo test --all

build_and_test_windows:
name: Build and test (Windows)
runs-on: ${{ matrix.os }}
Expand All @@ -60,11 +60,11 @@ jobs:
with:
toolchain: ${{ matrix.rust }}
target: ${{ matrix.target }}

- uses: msys2/setup-msys2@v2
- name: check
run: cargo check --all --bins --tests --target ${{ matrix.target }}

- name: check bench
if: matrix.rust == 'nightly'
run: cargo check --target ${{ matrix.target }} --benches
Expand Down Expand Up @@ -186,7 +186,7 @@ jobs:

- name: Install rust
# See https://github.com/cross-rs/cross/issues/1222
uses: dtolnay/rust-toolchain@1.67
uses: dtolnay/rust-toolchain@1.70

- name: Install cross
run: cargo install cross
Expand Down Expand Up @@ -256,7 +256,7 @@ jobs:
# uses: actions/checkout@master
# with:
# submodules: recursive

# - name: Install rust stable
# uses: dtolnay/rust-toolchain@stable

Expand All @@ -269,7 +269,7 @@ jobs:
# git clone https://github.com/n0-computer/chuck.git
# cd chuck
# cargo build --release

# - name: Install netsim deps
# run: |
# cd chuck/netsim
Expand All @@ -288,16 +288,16 @@ jobs:
# sudo mn --clean
# sudo python3 main.py --integration sims/standard/iroh.json

# - name: Setup Environment (PR)
# if: ${{ github.event_name == 'pull_request' }}
# shell: bash
# run: |
# - name: Setup Environment (PR)
# if: ${{ github.event_name == 'pull_request' }}
# shell: bash
# run: |
# echo "LAST_COMMIT_SHA=$(git rev-parse --short ${{ github.event.pull_request.head.sha }})" >> ${GITHUB_ENV}
# echo "HEAD_REF=${{ github.event.pull_request.head.ref }}" >> ${GITHUB_ENV}
# - name: Setup Environment (Push)
# if: ${{ github.event_name == 'push' }}
# shell: bash
# run: |
# - name: Setup Environment (Push)
# if: ${{ github.event_name == 'push' }}
# shell: bash
# run: |
# echo "LAST_COMMIT_SHA=$(git rev-parse --short ${GITHUB_SHA})" >> ${GITHUB_ENV}
# echo "HEAD_REF=${{ github.head_ref }}" >> ${GITHUB_ENV}

Expand All @@ -312,4 +312,4 @@ jobs:
# cd chuck/netsim
# d=$(cat report_metro.txt)
# metro_data=$(printf "%s\n " "$d")
# echo "$metro_data"
# echo "$metro_data"
4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ authors = ["dignifiedquire <[email protected]>", "n0 team"]
repository = "https://github.com/n0-computer/iroh"

# Sadly this also needs to be updated in .github/workflows/ci.yml
rust-version = "1.67"
rust-version = "1.70"

[dependencies]
abao = { version = "0.2.0", features = ["group_size_16k", "tokio_io"], default-features = false }
Expand Down Expand Up @@ -37,7 +37,7 @@ quinn = { version = "0.10", package = "iroh-quinn" }
rand = "0.7"
rcgen = "0.10"
ring = "0.16.20"
rustls = { version = "0.21", default-features = false, features = ["dangerous_configuration"] }
rustls = { version = ">= 0.21.11", default-features = false, features = ["dangerous_configuration"] }
serde = { version = "1", features = ["derive"] }
serde-error = "0.1.2"
ssh-key = { version = "0.5.1", features = ["ed25519", "std", "rand_core"] }
Expand Down

0 comments on commit 4fb2ccf

Please sign in to comment.