Skip to content

Commit

Permalink
Merge branch 'StevenBlack:master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
tbrammar authored May 15, 2023
2 parents ae3b83d + e9388c2 commit 09dd093
Show file tree
Hide file tree
Showing 64 changed files with 1,163,530 additions and 895,404 deletions.
16 changes: 11 additions & 5 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -1,14 +1,20 @@
# editorconfig.org

root = true

[*.py]
[*]
charset = utf-8
end_of_line = lf
indent_size = 2
indent_style = space
insert_final_newline = true
trim_trailing_whitespace = true
indent_size = 4
end_of_line = LF

[*.bat]
end_of_line = CRLF
end_of_line = crlf

[*.md]
trim_trailing_whitespace = false
insert_final_newline = true

[*.py]
indent_size = 4
2 changes: 1 addition & 1 deletion .github/stale.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ staleLabel: wontfix
# Comment to post when marking an issue as stale. Set to `false` to disable
markComment: >
This issue has been automatically marked as stale because it has not had
recent activity. It will be closed in 14 days if no further activity occurs.
recent activity. It will be closed in 14 days if no further activity occurs.
Thank you for your contributions.
# Comment to post when closing a stale issue. Set to `false` to disable
closeComment: >
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@ name: CI

on:
push:
branches:
- master
- "!dependabot/**"
pull_request:
workflow_dispatch:

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/container.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:
images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}

- name: Build and push container image
uses: docker/build-push-action@v3
uses: docker/build-push-action@v4
with:
context: .
push: ${{ github.event_name != 'pull_request' }}
Expand Down
Loading

0 comments on commit 09dd093

Please sign in to comment.