pi-hole/FTL
1
0
Fork 0
mirror of https://github.com/pi-hole/FTL.git synced 2024-10-26 16:52:18 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/update/dnsmasq' into new/http

Browse Source 
Signed-off-by: DL6ER <dl6er@dl6er.de>
This commit is contained in:
DL6ER
2023-03-31 10:10:54 +02:00
parent 99d64e9071 fa2aeccc0e
commit 06da29d56e
34 changed files with 696 additions and 412 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/build.yml
+6 -4
View File
@@ -24,7 +24,7 @@ jobs:
steps:
-
name: Checkout code
uses: actions/checkout@v3.3.0
uses: actions/checkout@v3.5.0
-
name: "Calculate required variables"
id: variables
@@ -53,7 +53,7 @@ jobs:
needs: smoke-tests
container: ghcr.io/pi-hole/ftl-build:v1.25-${{ matrix.arch }}
container: ghcr.io/pi-hole/ftl-build:v1.26-${{ matrix.arch }}
strategy:
fail-fast: false
@@ -81,6 +81,8 @@ jobs:
bin_name: pihole-FTL-armv8-linux-gnueabihf
- arch: aarch64
bin_name: pihole-FTL-aarch64-linux-gnu
- arch: riscv64
bin_name: pihole-FTL-riscv64-linux-gnu
env:
CI_ARCH: ${{ matrix.arch }}${{ matrix.arch_extra }}
@@ -88,7 +90,7 @@ jobs:
steps:
-
name: Checkout code
uses: actions/checkout@v3.3.0
uses: actions/checkout@v3.5.0
-
name: "Fix ownership of repository"
run: chown -R root .
@@ -142,7 +144,7 @@ jobs:
steps:
-
name: Checkout code
uses: actions/checkout@v3.3.0
uses: actions/checkout@v3.5.0
-
name: Get Binaries and documentation built in previous jobs
uses: actions/download-artifact@v3.0.2
.github/workflows/codespell.yml
+3 -3
View File
@@ -10,10 +10,10 @@ jobs:
steps:
-
name: Checkout repository
uses: actions/checkout@v3.3.0
uses: actions/checkout@v3.5.0
-
name: Spell-Checking
uses: codespell-project/actions-codespell@master
with:
ignore_words_file: .codespellignore
skip: ./src/database/sqlite3.c,./src/database/sqlite3.h,./src/database/shell.c,./src/lua,./src/dnsmasq,./src/tre-regex
ignore_words_file: .github/.codespellignore
skip: ./src/database/sqlite3.c,./src/database/sqlite3.h,./src/database/shell.c,./src/lua,./src/dnsmasq,./src/tre-regex,./.git,./test/libs
.github/workflows/stale.yml
+1 -1
View File
@@ -13,7 +13,7 @@ jobs:
issues: write
steps:
- uses: actions/stale@v7.0.0
- uses: actions/stale@v8.0.0
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
days-before-stale: 30
.github/workflows/stale_pr.yml
+1 -1
View File
@@ -17,7 +17,7 @@ jobs:
pull-requests: write
steps:
- uses: actions/stale@v7.0.0
- uses: actions/stale@v8.0.0
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
# Do not automatically mark PR/issue as stale
.github/workflows/sync-back-to-dev.yml
+1 -1
View File
@@ -11,7 +11,7 @@ jobs:
name: Syncing branches
steps:
- name: Checkout
uses: actions/checkout@v3.3.0
uses: actions/checkout@v3.5.0
- name: Opening pull request
run: gh pr create -B development -H master --title 'Sync master back into development' --body 'Created by Github action' --label 'internal'
env: