Skip to content

Commit d944d16

Browse files
authored
Merge pull request #5948 from fdefelici/fix/file-eol-management
fix: improve eol file management
2 parents 47cb4ed + f26d125 commit d944d16

File tree

3 files changed

+9
-4
lines changed

3 files changed

+9
-4
lines changed

.gitattributes

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,6 @@
11
legacy/* linguist-vendored
2-
* text=lf
2+
# Enforcing 'lf' eol mainly for:
3+
# - 'stx-genesis' package, where txt files need hash computation and comparison
4+
# - 'clarity' package, where clarity language is sensitive to line endings for .clar files
5+
# anyhow, setting eol for all text files to have a homogeneous management over the whole code base
6+
* text eol=lf

.vscode/settings.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,6 @@
77
},
88
"rust-analyzer.rustfmt.extraArgs": [
99
"+nightly"
10-
]
10+
],
11+
"files.eol": "\n"
1112
}

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,8 @@ _Warning, this typically takes a few minutes_
7777
cargo nextest run
7878
```
7979

80+
_On Windows, many tests will fail, mainly due to parallelism. To mitigate the issue you may need to run the tests individually._
81+
8082
## Run the testnet
8183

8284
You can observe the state machine in action locally by running:
@@ -85,8 +87,6 @@ You can observe the state machine in action locally by running:
8587
cargo run --bin stacks-node -- start --config ./sample/conf/testnet-follower-conf.toml
8688
```
8789

88-
_On Windows, many tests will fail if the line endings aren't `LF`. Please ensure that you have git's `core.autocrlf` set to `input` when you clone the repository to avoid any potential issues. This is due to the Clarity language currently being sensitive to line endings._
89-
9090
Additional testnet documentation is available [here](./docs/testnet.md) and [here](https://docs.stacks.co/docs/nodes-and-miners/miner-testnet)
9191

9292
## Release Process

0 commit comments

Comments
 (0)