Skip to content

Commit

Permalink
[CI] Upgrade to rust 1.74.0
Browse files Browse the repository at this point in the history
  • Loading branch information
glandium committed Nov 19, 2023
1 parent d0b2092 commit cb9a471
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 9 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/cargo-package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-latest, macos-latest]
toolchain: [1.73.0]
toolchain: [1.74.0]
include:
- os: windows-latest
toolchain: 1.73.0-x86_64-pc-windows-gnu
toolchain: 1.74.0-x86_64-pc-windows-gnu
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v3
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-latest, macos-latest]
toolchain: [1.73.0]
toolchain: [1.74.0]
include:
- os: windows-latest
toolchain: 1.73.0-x86_64-pc-windows-gnu
toolchain: 1.74.0-x86_64-pc-windows-gnu
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v3
Expand Down Expand Up @@ -51,7 +51,7 @@ jobs:
- uses: actions/checkout@v3
- uses: dtolnay/rust-toolchain@master
with:
toolchain: 1.73.0
toolchain: 1.74.0
components: rustfmt
- run: cargo fmt -- --check

Expand All @@ -60,10 +60,10 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-latest, macos-latest]
toolchain: [1.73.0, 1.70.0]
toolchain: [1.74.0, 1.70.0]
include:
- os: windows-latest
toolchain: 1.73.0-x86_64-pc-windows-gnu
toolchain: 1.74.0-x86_64-pc-windows-gnu
- os: windows-latest
toolchain: 1.70.0-x86_64-pc-windows-gnu
runs-on: ${{ matrix.os }}
Expand Down
4 changes: 2 additions & 2 deletions CI/tools.py
Original file line number Diff line number Diff line change
Expand Up @@ -284,7 +284,7 @@ def install(self):
]


def install_rust(version='1.73.0', target='x86_64-unknown-linux-gnu'):
def install_rust(version='1.74.0', target='x86_64-unknown-linux-gnu'):
rustup_opts = '-y --default-toolchain none'
cargo_dir = '$HOME/.cargo/bin/'
rustup = cargo_dir + 'rustup'
Expand Down Expand Up @@ -427,7 +427,7 @@ def prefix(p, s):
f'/sysroot-{arch}/usr/share/pkgconfig',
))
if variant in ('coverage', 'asan'):
rust_install = install_rust('nightly-2023-05-29', rust_target)
rust_install = install_rust('nightly-2023-10-02', rust_target)
elif rust_version:
rust_install = install_rust(rust_version, target=rust_target)
else:
Expand Down

0 comments on commit cb9a471

Please sign in to comment.