Skip to content

Commit

Permalink
Merge branch 'master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
creack authored Oct 31, 2023
2 parents e9c1f00 + 2dfd24d commit 17650f9
Show file tree
Hide file tree
Showing 13 changed files with 579 additions and 327 deletions.
54 changes: 54 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
root = true

# Sane defaults.
[*]
# Always use unix end of line.
end_of_line = lf
# Always insert a new line at the end of files.
insert_final_newline = true
# Don't leave trailing whitespaces.
trim_trailing_whitespace = true
# Default to utf8 encoding.
charset = utf-8
# Space > tab for consistent aligns.
indent_style = space
# Default to 2 spaces for indent/tabs.
indent_size = 2
# Flag long lines.
max_line_length = 140

# Explicitly define settings for commonly used files.

[*.go]
indent_style = tab
indent_size = 8

[*.feature]
indent_style = space
indent_size = 2

[*.json]
indent_style = space
indent_size = 2

[*.{yml,yaml}]
indent_style = space
indent_size = 2

[*.tf]
indent_style = space
indent_size = 2

[*.md]
# Don't check line lenghts in files.
max_line_length = 0

[{Makefile,*.mk}]
indent_style = tab
indent_size = 8

[{Dockerfile,Dockerfile.*}]
indent_size = 4

[*.sql]
indent_size = 2
5 changes: 4 additions & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,5 +48,8 @@ jobs:
- name: Build
run: go build -v

- name: Test
# Skip tests for 1.6 as we use modern Go.
# If the main lib builds and tests pass on other versions, we are good.
- if: ${{ matrix.go_version != '1.6.x' }}
name: Test
run: go test -v
324 changes: 324 additions & 0 deletions .golangci.yml

Large diffs are not rendered by default.

Loading

0 comments on commit 17650f9

Please sign in to comment.