Skip to content

Commit 96d9291

Browse files
committed
Merge commit 'ba9c12be0f58de8181e31c971f11609ddb2536a6' into readStringUntil
2 parents 5858220 + ba9c12b commit 96d9291

File tree

3 files changed

+45
-2
lines changed

3 files changed

+45
-2
lines changed

.gitattributes

Lines changed: 39 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,40 @@
1+
# https://docs.github.com/en/github/using-git/configuring-git-to-handle-line-endings
2+
# https://git-scm.com/docs/gitattributes
3+
# https://git-scm.com/docs/git-config
4+
# https://adaptivepatchwork.com/2012/03/01/mind-the-end-of-your-line/
5+
6+
# Configure this repository to use Git's type detection algorithm to guess
7+
# whether a file is text or binary. Text files will have line endings converted
8+
# as if you had set
9+
# eol=native
10+
# That is, on Windows text files will have CRLF line endings in your working
11+
# directory while on Linux and macOS your text files will have LF line endings
12+
# in your working directory. In either case, they will have LF line endings in
13+
# the Git repository itself.
14+
115
# Set the default behavior, in case people don't have core.autocrlf set.
2-
* text eol=lf
16+
* text=auto
17+
18+
# Explicitly declare text files you want to always be normalized and converted
19+
# to native line endings on checkout. Git would likely get these right, but
20+
# we can be sure by adding them here.
21+
*.ino text diff=cpp
22+
*.c text diff=c
23+
*.cc text diff=cpp
24+
*.cxx text diff=cpp
25+
*.cpp text diff=cpp
26+
*.c++ text diff=cpp
27+
*.hpp text diff=cpp
28+
*.h text diff=c
29+
*.h++ text diff=cpp
30+
*.hh text diff=cpp
31+
32+
*.md text
33+
*.yaml text
34+
*.yml text
35+
36+
37+
# Denote all files that are truly binary and should not be modified.
38+
# Even if we don't have any of these, they make a good example.
39+
*.png binary
40+
*.jpg binary

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
1111
- `--min-free-space=N` command-line argument to fail if free space is below requred value
1212

1313
### Changed
14+
- Put build artifacts in a separate directory to reduce clutter.
1415
- Change 266 files from CRLF to LF.
16+
- Update .gitattributes so we have consistent line endings
1517
- Run tests on push as well as on a pull request so developers can see impact
1618

1719
### Deprecated

lib/arduino_ci/cpp_library.rb

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -491,7 +491,10 @@ def test_args(aux_libraries, ci_gcc_config)
491491
# @return [Pathname] path to the compiled test executable
492492
def build_for_test_with_configuration(test_file, aux_libraries, gcc_binary, ci_gcc_config)
493493
base = test_file.basename
494-
executable = Pathname.new("unittest_#{base}.bin").expand_path
494+
# hide build artifacts
495+
build_dir = '.arduino_ci'
496+
Dir.mkdir build_dir unless File.exist?(build_dir)
497+
executable = Pathname.new("#{build_dir}/unittest_#{base}.bin").expand_path
495498
File.delete(executable) if File.exist?(executable)
496499
arg_sets = []
497500
arg_sets << ["-std=c++0x", "-o", executable.to_s, "-DARDUINO=100"]

0 commit comments

Comments
 (0)