Skip to content

Commit ee384c6

Browse files
chore: update MSRV to 1.85
1.85 is approvimately 6mo old at this time, latest is 1.89, but latest we can currently use is 1.88. jj is also currently using 1.85
1 parent 411e112 commit ee384c6

File tree

8 files changed

+18
-18
lines changed

8 files changed

+18
-18
lines changed

.github/workflows/lint.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
uses: actions-rs/toolchain@v1
3131
with:
3232
profile: minimal
33-
toolchain: 1.74
33+
toolchain: 1.85
3434
components: rustfmt, clippy
3535
override: true
3636

.github/workflows/linux-git-devel.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: "Linux (Git devel)"
1+
name: 'Linux (Git devel)'
22

33
on:
44
# TODO(#1416): re-enable once tests are passing on Git v2.46+
@@ -54,7 +54,7 @@ jobs:
5454
uses: actions-rs/toolchain@v1
5555
with:
5656
profile: minimal
57-
toolchain: 1.74
57+
toolchain: 1.85
5858
override: true
5959

6060
- uses: actions/checkout@v5

.github/workflows/linux.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
matrix:
1919
# Use a tag from https://github.com/git/git/tags
2020
# Make sure to update `git-version` in the `run-tests` step as well.
21-
git-version: ["v2.24.3", "v2.29.2", "v2.33.1", "v2.37.3"]
21+
git-version: ['v2.24.3', 'v2.29.2', 'v2.33.1', 'v2.37.3']
2222

2323
steps:
2424
- uses: actions/checkout@v5
@@ -45,7 +45,7 @@ jobs:
4545
- name: Package Git
4646
run: tar -czf git.tar.gz git git-*
4747

48-
- name: "Upload artifact: git"
48+
- name: 'Upload artifact: git'
4949
uses: actions/upload-artifact@v4
5050
with:
5151
name: git-${{ matrix.git-version }}
@@ -58,7 +58,7 @@ jobs:
5858

5959
strategy:
6060
matrix:
61-
git-version: ["v2.24.3", "v2.29.2", "v2.33.1", "v2.37.3"]
61+
git-version: ['v2.24.3', 'v2.29.2', 'v2.33.1', 'v2.37.3']
6262

6363
steps:
6464
- uses: actions/checkout@v5
@@ -67,14 +67,14 @@ jobs:
6767
with:
6868
name: git-${{ matrix.git-version }}
6969

70-
- name: "Unpack artifact: git"
70+
- name: 'Unpack artifact: git'
7171
run: tar -xf git.tar.gz
7272

7373
- name: Set up Rust
7474
uses: actions-rs/toolchain@v1
7575
with:
7676
profile: minimal
77-
toolchain: 1.74
77+
toolchain: 1.85
7878
override: true
7979

8080
- name: Cache dependencies

.github/workflows/macos.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: macOS
33
on:
44
schedule:
55
# Run once every day at 6:40AM UTC.
6-
- cron: "40 6 * * *"
6+
- cron: '40 6 * * *'
77

88
push:
99
branches:
@@ -27,7 +27,7 @@ jobs:
2727
uses: actions-rs/toolchain@v1
2828
with:
2929
profile: minimal
30-
toolchain: 1.74
30+
toolchain: 1.85
3131
override: true
3232

3333
- name: Cache dependencies

.github/workflows/windows.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
uses: actions-rs/toolchain@v1
2121
with:
2222
profile: minimal
23-
toolchain: 1.74
23+
toolchain: 1.85
2424
override: true
2525

2626
- name: Cache dependencies

.gitpod.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ image:
22
file: .gitpod/Dockerfile
33
tasks:
44
- init: |
5-
rustup default 1.74
5+
rustup default 1.85
66
cargo test --no-run
77
cargo install cargo-insta
88
cargo install git-branchless && git branchless init
99
vscode:
1010
extensions:
11-
- "matklad.rust-analyzer"
11+
- 'matklad.rust-analyzer'

git-branchless/Cargo.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ license = "MIT OR Apache-2.0"
1111
name = "git-branchless"
1212
readme = "../README.md"
1313
repository = "https://github.com/arxanas/git-branchless"
14-
rust-version = "1.74"
14+
rust-version = "1.85"
1515
version = "0.10.0"
1616

1717
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
@@ -64,9 +64,9 @@ man-pages = []
6464

6565
[package.metadata.release]
6666
pre-release-replacements = [
67-
{ file = "../CHANGELOG.md", search = "Unreleased", replace = "{{version}}", min = 1 },
68-
{ file = "../CHANGELOG.md", search = "ReleaseDate", replace = "{{date}}", min = 1 },
69-
{ file = "../CHANGELOG.md", search = "<!-- next-header -->", replace = "<!-- next-header -->\n## [Unreleased] - ReleaseDate\n", exactly = 1 },
67+
{ file = "../CHANGELOG.md", search = "Unreleased", replace = "{{version}}", min = 1 },
68+
{ file = "../CHANGELOG.md", search = "ReleaseDate", replace = "{{date}}", min = 1 },
69+
{ file = "../CHANGELOG.md", search = "<!-- next-header -->", replace = "<!-- next-header -->\n## [Unreleased] - ReleaseDate\n", exactly = 1 },
7070
]
7171

7272
[[test]]

rust-toolchain.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
[toolchain]
22
# Current minimum-supported Rust version
3-
channel = "1.74"
3+
channel = "1.85"
44
profile = "default"

0 commit comments

Comments
 (0)