Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update rust-toolchain to 1.70.0 #137

Merged
merged 2 commits into from
Feb 3, 2024
+15 −15
Merged

Update rust-toolchain to 1.70.0 #137

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cdf3d0d
Update rust-toolchain to 1.70.0
togatoga Sep 23, 2023
4d85d29
Replace 1.42 with 1.70.0
togatoga Sep 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
fail-fast: false
matrix:
toolchain:
- 1.42.0-x86_64-unknown-linux-gnu
- 1.70.0-x86_64-unknown-linux-gnu
- stable-x86_64-unknown-linux-gnu

name: Rustfmt (${{ matrix.toolchain }})
Expand Down Expand Up @@ -43,16 +43,16 @@ jobs:
fail-fast: false
matrix:
toolchain:
- 1.42.0-x86_64-pc-windows-msvc
- 1.42.0-x86_64-apple-darwin
- 1.42.0-x86_64-unknown-linux-gnu
- 1.70.0-x86_64-pc-windows-msvc
- 1.70.0-x86_64-apple-darwin
- 1.70.0-x86_64-unknown-linux-gnu
- stable-x86_64-pc-windows-msvc
- stable-x86_64-apple-darwin
- stable-x86_64-unknown-linux-gnu
include:
- { toolchain: 1.42.0-x86_64-pc-windows-msvc , os: windows-2019 }
- { toolchain: 1.42.0-x86_64-apple-darwin , os: macos-11 }
- { toolchain: 1.42.0-x86_64-unknown-linux-gnu, os: ubuntu-20.04 }
- { toolchain: 1.70.0-x86_64-pc-windows-msvc , os: windows-2019 }
- { toolchain: 1.70.0-x86_64-apple-darwin , os: macos-11 }
- { toolchain: 1.70.0-x86_64-unknown-linux-gnu, os: ubuntu-20.04 }
- { toolchain: stable-x86_64-pc-windows-msvc , os: windows-2019 }
- { toolchain: stable-x86_64-apple-darwin , os: macos-11 }
- { toolchain: stable-x86_64-unknown-linux-gnu, os: ubuntu-20.04 }
Expand Down Expand Up @@ -97,7 +97,7 @@ jobs:
fail-fast: false
matrix:
toolchain:
- 1.42.0-x86_64-unknown-linux-gnu
- 1.70.0-x86_64-unknown-linux-gnu
- stable-x86_64-unknown-linux-gnu
python-version:
- '3.6' # https://packages.ubuntu.com/bionic/python3
Expand Down Expand Up @@ -136,14 +136,14 @@ jobs:
- name: Checkout
uses: actions/checkout@v3

- name: Setup `1.60.0-x86_64-unknown-linux-gnu`
- name: Setup `1.70.0-x86_64-unknown-linux-gnu`
uses: dtolnay/rust-toolchain@master
with:
toolchain: 1.60.0-x86_64-unknown-linux-gnu
toolchain: 1.70.0-x86_64-unknown-linux-gnu

- name: 'Override `1.60.0-x86_64-unknown-linux-gnu'
- name: 'Override `1.70.0-x86_64-unknown-linux-gnu'
run: |
rustup override set 1.60.0-x86_64-unknown-linux-gnu
rustup override set 1.70.0-x86_64-unknown-linux-gnu

- name: Setup Python 3.9
uses: actions/setup-python@v4
Expand Down
2 changes: 1 addition & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name = "ac-library-rs"
version = "0.2.0-alpha.1"
edition = "2018"
rust-version = "1.42"
rust-version = "1.70"
description = "A Rust port of AtCoder Library (ACL)."
license = "CC0-1.0"
repository = "https://github.com/rust-lang-ja/ac-library-rs"
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# ac-library-rs

[![CI](https://github.com/rust-lang-ja/ac-library-rs/workflows/CI/badge.svg)](https://github.com/rust-lang-ja/ac-library-rs/actions?workflow=CI)
[![Rust 2018 1.42.0+](https://img.shields.io/badge/rust%202018-1.42.0+-lightgray.svg)](https://www.rust-lang.org)
[![Rust 2018 1.70.0+](https://img.shields.io/badge/rust%202018-1.70.0+-lightgray.svg)](https://www.rust-lang.org)
[![Crates.io](https://img.shields.io/crates/v/ac-library-rs.svg)](https://crates.io/crates/ac-library-rs)
[![License](https://img.shields.io/crates/l/ac-library-rs.svg)](https://crates.io/crates/ac-library-rs)

Expand Down
2 changes: 1 addition & 1 deletion rust-toolchain
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.42.0
1.70.0