Skip to content

Commit 80d03d7

Browse files
authored
Merge pull request #1883 from pi-hole/editorconfig
Add editorconfig
2 parents d0312a4 + 0324370 commit 80d03d7

16 files changed

Lines changed: 73 additions & 38 deletions

.editorconfig

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
# EditorConfig is awesome: https://editorconfig.org/
2+
3+
# top-most EditorConfig file
4+
root = true
5+
6+
# Unix-style newlines with a newline ending every file
7+
[*]
8+
end_of_line = lf
9+
insert_final_newline = true
10+
indent_style = space
11+
indent_size = tab
12+
tab_width = 4
13+
charset = utf-8
14+
trim_trailing_whitespace = true
15+
16+
[*.yml]
17+
tab_width = 2
18+
19+
[*.md]
20+
tab_width = 2

.github/ISSUE_TEMPLATE/bug_report.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,31 +12,31 @@ assignees: ''
1212

1313
<!-- IMPORTANT Complete the entire template please, the info gathered here is usually needed to debug issues anyway so it saves time in the long run. Incomplete/stock template issues may be closed -->
1414

15-
<!-- pick ONE: Bug,
16-
Feature Request,
17-
Run Issue (running Pi-hole container failing),
18-
Build Issue (Building image failing)
15+
<!-- pick ONE: Bug,
16+
Feature Request,
17+
Run Issue (running Pi-hole container failing),
18+
Build Issue (Building image failing)
1919
Enter in line below: -->
20-
This is a: **FILL ME IN**
20+
This is a: **FILL ME IN**
2121

2222

2323
## Details
2424
<!-- Provide a more detailed introduction to the issue or feature, try not to duplicate info from lower sections by reviewing the entire template first -->
2525

2626
## Related Issues
27-
- [ ] I have searched this repository/Pi-hole forums for existing issues and pull requests that look similar
27+
- [ ] I have searched this repository/Pi-hole forums for existing issues and pull requests that look similar
2828
<!-- Add links below! -->
2929

3030
<!------- FEATURE REQUESTS CAN STOP FILLING IN TEMPLATE HERE -------->
3131
<!------- ISSUES SHOULD FILL OUT REMAINDER OF TEMPLATE -------->
3232

33-
## How to reproduce the issue
33+
## How to reproduce the issue
3434

3535
1. Environment data
3636
* Operating System: **ENTER HERE** <!-- Debian, Ubuntu, Rasbian, etc -->
3737
* Hardware: <!-- PC, RasPi B/2B/3B/4B, Mac, Synology, QNAP, etc -->
3838
* Kernel Architecture: <!-- x86/amd64, ArmV7, ArmV8 32bit, ArmV8 64bit, etc -->
39-
* Docker Install Info and version:
39+
* Docker Install Info and version:
4040
- Software source: <!-- official docker-ce, OS provided package, Hypriot -->
4141
- Supplimentary Software: <!-- synology, portainer, etc -->
4242
* Hardware architecture: <!-- ARMv7, x86 -->

.github/ISSUE_TEMPLATE/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@ contact_links:
99
- name: Documentation
1010
url: https://docs.pi-hole.net
1111
about: Documentation and guides.
12-
12+

.github/dependabot.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ version: 2
22
updates:
33
# Maintain dependencies for GitHub Actions
44
- package-ecosystem: "github-actions"
5-
directories:
5+
directories:
66
- "/"
77
schedule:
88
interval: "weekly"

.github/workflows/build-and-publish.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
runner: ubuntu-24.04-arm
3434
- platform: linux/riscv64
3535
runner: ubuntu-24.04-arm
36-
36+
3737
steps:
3838
- name: Prepare name for digest up/download
3939
run: |
@@ -57,7 +57,7 @@ jobs:
5757
github-token: ${{ secrets.GITHUB_TOKEN }}
5858
images: |
5959
${{ env.dockerhub }}
60-
${{ env.ghcr }}
60+
${{ env.ghcr }}
6161
flavor: |
6262
latest=${{ startsWith(github.ref, 'refs/tags/') }}
6363
tags: |
@@ -95,10 +95,10 @@ jobs:
9595
context: ./src/
9696
platforms: ${{ matrix.platform }}
9797
build-args: |
98-
PIHOLE_DOCKER_TAG=${{ steps.meta.outputs.version }}
98+
PIHOLE_DOCKER_TAG=${{ steps.meta.outputs.version }}
9999
FTL_BRANCH=${{ env.components_branch }}
100100
CORE_BRANCH=${{ env.components_branch }}
101-
WEB_BRANCH=${{ env.components_branch }}
101+
WEB_BRANCH=${{ env.components_branch }}
102102
PADD_BRANCH=${{ env.components_branch }}
103103
labels: ${{ steps.meta.outputs.labels }}
104104
outputs: |
@@ -142,7 +142,7 @@ jobs:
142142
path: /tmp/digests
143143
pattern: digests-*
144144
merge-multiple: true
145-
145+
146146
- name: Set up Docker Buildx
147147
uses: docker/setup-buildx-action@v3
148148

@@ -187,4 +187,4 @@ jobs:
187187
- name: Inspect images
188188
run: |
189189
docker buildx imagetools inspect ${{ env.dockerhub }}:${{ steps.meta.outputs.version }}
190-
docker buildx imagetools inspect ${{ env.ghcr }}:${{ steps.meta.outputs.version }}
190+
docker buildx imagetools inspect ${{ env.ghcr }}:${{ steps.meta.outputs.version }}

.github/workflows/build-and-test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
uses: actions/setup-python@v5.6.0
3535
with:
3636
python-version: "3.13"
37-
37+
3838
- name: Run black formatter
3939
run: |
4040
pip install black

.github/workflows/editorconfig.yml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
name: Editorconfig-Checker
2+
on:
3+
pull_request:
4+
types: [opened, synchronize, reopened, ready_for_review]
5+
6+
jobs:
7+
editorconfig-checker:
8+
if: github.event.pull_request.draft == false
9+
runs-on: ubuntu-latest
10+
steps:
11+
- name: Checkout repository
12+
uses: actions/checkout@v4
13+
14+
- name: Get editorconfig-checker
15+
uses: editorconfig-checker/action-editorconfig-checker@main # tag v1.0.0 is really out of date
16+
17+
- name: Run editorconfig-checker
18+
run: editorconfig-checker

.github/workflows/housekeeping.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@ jobs:
1717
repository: ${{ github.repository }}
1818
untagged_only: true
1919
owner_type: org # or user
20-
except_untagged_multiplatform: true
20+
except_untagged_multiplatform: true

.gitignore

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,11 @@ docker-compose.yml
1313
etc-dnsmasq.d/
1414
etc-pihole/
1515
var-log/
16+
.vscode/
17+
.pytest_cache/
1618

1719
# WIP/test stuff
1820
doco.yml
1921

2022
# Ignore FTL Binary if it exists
21-
src/pihole-FTL
23+
src/pihole-FTL

.vscode/settings.json

Lines changed: 0 additions & 5 deletions
This file was deleted.

0 commit comments

Comments
 (0)