Skip to content

Commit

Permalink
Fix nightly build (again) - gitattributes (#1357)
Browse files Browse the repository at this point in the history
* Fix gitattributes to mostly apply to the containers directory
* Remove CRs from the .gitignore file
  • Loading branch information
rfay committed Dec 27, 2018
1 parent 56c8ef7 commit 8121205
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 17 deletions.
7 changes: 6 additions & 1 deletion .gitattributes
@@ -1,6 +1,11 @@
# On Windows the wrong line endings break docker containers
# Article: https://help.github.com/articles/dealing-with-line-endings/
* text eol=lf
* text=auto
/containers text eol=lf
.gitignore text
*.png binary
*.jpg binary
*.tqr binary
*gz binary
*MY? binary

32 changes: 16 additions & 16 deletions .gitignore
@@ -1,16 +1,16 @@
# Temporary build-tools artifacts to be ignored
/.go/
/.gotmp/
/bin/
/.container*
/.push*
/linux
/darwin
/windows
/.dockerfile
/VERSION.txt
/.docker_image
/debug
/debug.test

/.idea
# Temporary build-tools artifacts to be ignored
/.go/
/.gotmp/
/bin/
/.container*
/.push*
/linux
/darwin
/windows
/.dockerfile
/VERSION.txt
/.docker_image
/debug
/debug.test

/.idea

0 comments on commit 8121205

Please sign in to comment.