File tree Expand file tree Collapse file tree 9 files changed +18
-28
lines changed
Expand file tree Collapse file tree 9 files changed +18
-28
lines changed Original file line number Diff line number Diff line change @@ -46,12 +46,12 @@ jobs:
4646 - &checkout-repo
4747 name : Checkout Repo
4848 if : github.event_name != 'schedule'
49- uses : actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
49+ uses : actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
5050
5151 - &checkout-dev
5252 name : Checkout dev branch if scheduled
5353 if : github.event_name == 'schedule'
54- uses : actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
54+ uses : actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
5555 with :
5656 ref : development
5757
Original file line number Diff line number Diff line change 2828 CI_ARCH : ${{ matrix.platform }}
2929 steps :
3030 - name : Checkout Repo
31- uses : actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
31+ uses : actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
3232
3333 - name : Set up QEMU
3434 uses : docker/setup-qemu-action@c7c53464625b32c7a7e944ae62b3e17d2b600130 # v3.7.0
Original file line number Diff line number Diff line change 1313 steps :
1414 -
1515 name : Checkout repository
16- uses : actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
16+ uses : actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
1717 -
1818 name : Spell-Checking
1919 uses : codespell-project/actions-codespell@8f01853be192eb0f849a5c7d721450e7a467c579 # v2.2
Original file line number Diff line number Diff line change 1212 dockerHubDescription :
1313 runs-on : ubuntu-latest
1414 steps :
15- - uses : actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
15+ - uses : actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
1616
1717 - name : Docker Hub Description
1818 uses : peter-evans/dockerhub-description@1b9a80c056b620d92cedb9d9b5a223409c68ddfa # v5
Original file line number Diff line number Diff line change 1212 runs-on : ubuntu-latest
1313 steps :
1414 - name : Checkout repository
15- uses : actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
15+ uses : actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
1616
1717 - name : Get editorconfig-checker
1818 uses : editorconfig-checker/action-editorconfig-checker@4b6cd6190d435e7e084fb35e36a096e98506f7b9 # v2.1.0
Original file line number Diff line number Diff line change 4545 runs-on : ubuntu-latest
4646 steps :
4747 - name : Checkout
48- uses : actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
48+ uses : actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
4949 - name : Remove 'stale' label
5050 run : gh issue edit ${{ github.event.issue.number }} --remove-label ${{ env.stale_label }}
5151 env :
Original file line number Diff line number Diff line change 1515 name : Syncing branches
1616 steps :
1717 - name : Checkout
18- uses : actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
18+ uses : actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
1919 - name : Opening pull request
2020 run : gh pr create -B development -H master --title 'Sync master back into development' --body 'Created by Github action' --label 'internal'
2121 env :
Original file line number Diff line number Diff line change 66def test_ftlconf_webserver_port (docker ):
77 func = docker .run ("echo ${FTLCONF_webserver_port}" )
88 assert "999" in func .stdout
9- func = docker .run (
10- """
9+ func = docker .run ("""
1110 sleep 5
1211 pihole-FTL --config webserver.port
13- """
14- )
12+ """ )
1513 assert "999" in func .stdout
1614
1715
@@ -22,12 +20,10 @@ def test_ftlconf_webserver_port(docker):
2220def test_ftlconf_dns_upstreams (docker ):
2321 func = docker .run ("echo ${FTLCONF_dns_upstreams}" )
2422 assert "1.2.3.4;5.6.7.8#1234" in func .stdout
25- func = docker .run (
26- """
23+ func = docker .run ("""
2724 sleep 5
2825 pihole-FTL --config dns.upstreams
29- """
30- )
26+ """ )
3127 assert "[ 1.2.3.4, 5.6.7.8#1234 ]" in func .stdout
3228
3329
Original file line number Diff line number Diff line change 77def test_pihole_uid_env_var (docker ):
88 func = docker .run ("echo ${PIHOLE_UID}" )
99 assert "456" in func .stdout
10- func = docker .run (
11- """
10+ func = docker .run ("""
1211 sleep 5
1312 id -u pihole
14- """
15- )
13+ """ )
1614 assert "456" in func .stdout
1715
1816
@@ -21,12 +19,10 @@ def test_pihole_uid_env_var(docker):
2119def test_pihole_gid_env_var (docker ):
2220 func = docker .run ("echo ${PIHOLE_GID}" )
2321 assert "456" in func .stdout
24- func = docker .run (
25- """
22+ func = docker .run ("""
2623 sleep 5
2724 id -g pihole
28- """
29- )
25+ """ )
3026 assert "456" in func .stdout
3127
3228
@@ -90,11 +86,9 @@ def test_pihole_ftl_starts_and_shuts_down_cleanly(docker):
9086
9187
9288def test_cronfile_valid (docker ):
93- func = docker .run (
94- """
89+ func = docker .run ("""
9590 /usr/bin/crontab /crontab.txt
9691 crond -d 8 -L /cron.log
9792 grep 'parse error' /cron.log
98- """
99- )
93+ """ )
10094 assert "parse error" not in func .stdout
You can’t perform that action at this time.
0 commit comments