Skip to content

Commit fa04c67

Browse files
authored
ci: fix windows CRLF on binary builds, cargo-shuttle 0.57.1 (#2118)
* ci: checkout with LF on windows build * tmp: test windows build * Revert "tmp: test windows build" This reverts commit 7c3e54c. * 0.57.1
1 parent f85a2ab commit fa04c67

File tree

3 files changed

+11
-4
lines changed

3 files changed

+11
-4
lines changed

.circleci/config.yml

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -294,19 +294,26 @@ jobs:
294294
CARGO_NET_GIT_FETCH_WITH_CLI: "true"
295295
steps:
296296
- checkout
297+
- run:
298+
name: Configure Git line endings (native/LF on checkout)
299+
shell: powershell.exe
300+
command: |
301+
git config core.autocrlf input
302+
git rm --cached -r .
303+
git reset --hard
297304
- run:
298305
name: Install Rust
306+
shell: powershell.exe
299307
# Note: Let binary build use latest stable Rust
300308
command: |
301309
choco uninstall rust # The one coming from choco interferes with the one coming from rustup
302310
wget -OutFile "C:\rustup-init.exe" https://static.rust-lang.org/rustup/dist/x86_64-pc-windows-msvc/rustup-init.exe
303311
C:\rustup-init.exe -y --target x86_64-pc-windows-msvc
304-
shell: powershell.exe
305312
- run:
306313
name: Build
314+
shell: powershell.exe
307315
command: |
308316
cargo.exe build --release --package cargo-shuttle --target x86_64-pc-windows-msvc
309-
shell: powershell.exe
310317
- make-artifact:
311318
target: x86_64-pc-windows-msvc
312319
suffix: ".exe"

Cargo.lock

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

cargo-shuttle/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "cargo-shuttle"
3-
version = "0.57.0"
3+
version = "0.57.1"
44
edition.workspace = true
55
license.workspace = true
66
repository.workspace = true

0 commit comments

Comments
 (0)