Skip to content

Commit dc0a9d2

Browse files
committed
ci: small clean-ups
The regex 1.10 release bumped the MSRV to Rust 1.65, so we no longer need to pin to an older memchr release. We also bump to `actions/checkout@v4`.
1 parent a3d5975 commit dc0a9d2

File tree

1 file changed

+8
-27
lines changed

1 file changed

+8
-27
lines changed

.github/workflows/ci.yml

+8-27
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ jobs:
7979
rust: stable-x86_64-gnu
8080
steps:
8181
- name: Checkout repository
82-
uses: actions/checkout@v3
82+
uses: actions/checkout@v4
8383
- name: Install Rust
8484
uses: dtolnay/rust-toolchain@master
8585
with:
@@ -137,30 +137,11 @@ jobs:
137137
runs-on: ubuntu-latest
138138
steps:
139139
- name: Checkout repository
140-
uses: actions/checkout@v3
140+
uses: actions/checkout@v4
141141
- name: Install Rust
142142
uses: dtolnay/rust-toolchain@master
143143
with:
144144
toolchain: 1.65.0
145-
# The memchr 2.6 release purportedly bumped its MSRV to Rust 1.60, but it
146-
# turned out that on aarch64, it was using something that wasn't stabilized
147-
# until Rust 1.61[1]. (This was an oversight on my part. I had previously
148-
# thought everything I needed was on Rust 1.60.) To resolve that, I just
149-
# bumped memchr's MSRV to 1.61. Since it was so soon after the memchr 2.6
150-
# release, I treated this as a bugfix.
151-
#
152-
# But the regex crate's MSRV is at Rust 1.60, and it now depends on at
153-
# least memchr 2.6 (to make use of its `alloc` feature). So we can't set
154-
# a lower minimal version. And I can't just bump the MSRV in a patch
155-
# release as a bug fix because regex 1.9 was released quite some time ago.
156-
# I could just release regex 1.10 and bump the MSRV there, but eh, I don't
157-
# want to put out another minor version release just for this.
158-
#
159-
# So... pin memchr to 2.6.2, which at least works on x86-64 on Rust 1.60.
160-
#
161-
# [1]: https://github.com/BurntSushi/memchr/issues/136
162-
- name: Pin memchr to 2.6.2
163-
run: cargo update -p memchr --precise 2.6.2
164145
- name: Basic build
165146
run: cargo build --verbose
166147
- name: Build docs
@@ -177,7 +158,7 @@ jobs:
177158
runs-on: ubuntu-latest
178159
steps:
179160
- name: Checkout repository
180-
uses: actions/checkout@v3
161+
uses: actions/checkout@v4
181162
- name: Install Rust
182163
uses: dtolnay/rust-toolchain@master
183164
with:
@@ -190,7 +171,7 @@ jobs:
190171
runs-on: ubuntu-latest
191172
steps:
192173
- name: Checkout repository
193-
uses: actions/checkout@v3
174+
uses: actions/checkout@v4
194175
- name: Install Rust
195176
uses: dtolnay/rust-toolchain@master
196177
with:
@@ -203,7 +184,7 @@ jobs:
203184
runs-on: ubuntu-latest
204185
steps:
205186
- name: Checkout repository
206-
uses: actions/checkout@v3
187+
uses: actions/checkout@v4
207188
- name: Install Rust
208189
uses: dtolnay/rust-toolchain@master
209190
with:
@@ -216,7 +197,7 @@ jobs:
216197
runs-on: ubuntu-latest
217198
steps:
218199
- name: Checkout repository
219-
uses: actions/checkout@v3
200+
uses: actions/checkout@v4
220201
- name: Install Rust
221202
uses: dtolnay/rust-toolchain@master
222203
with:
@@ -231,7 +212,7 @@ jobs:
231212
runs-on: ubuntu-latest
232213
steps:
233214
- name: Checkout repository
234-
uses: actions/checkout@v3
215+
uses: actions/checkout@v4
235216
- name: Install Rust
236217
uses: dtolnay/rust-toolchain@master
237218
with:
@@ -248,7 +229,7 @@ jobs:
248229
runs-on: ubuntu-latest
249230
steps:
250231
- name: Checkout repository
251-
uses: actions/checkout@v3
232+
uses: actions/checkout@v4
252233
- name: Install Rust
253234
uses: dtolnay/rust-toolchain@master
254235
with:

0 commit comments

Comments
 (0)