From b2dadba5af92983b34745b29b1f31be978178e81 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20K=C3=B6nig?= Date: Tue, 13 Dec 2022 22:41:29 +0100 Subject: [PATCH 01/13] Add merge conflict workflow MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Christian König --- .github/workflows/merge-conflict.yml | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 .github/workflows/merge-conflict.yml diff --git a/.github/workflows/merge-conflict.yml b/.github/workflows/merge-conflict.yml new file mode 100644 index 000000000..971ecb884 --- /dev/null +++ b/.github/workflows/merge-conflict.yml @@ -0,0 +1,21 @@ +name: "Check for merge conflicts" +on: + # So that PRs touching the same files as the push are updated + push: + # So that the `dirtyLabel` is removed if conflicts are resolve + # We recommend `pull_request_target` so that github secrets are available. + # In `pull_request` we wouldn't be able to change labels of fork PRs + pull_request_target: + types: [synchronize] + +jobs: + main: + runs-on: ubuntu-latest + steps: + - name: Check if PRs are have merge conflicts + uses: eps1lon/actions-label-merge-conflict@v2.1.0 + with: + dirtyLabel: "Merge conflicts" + repoToken: "${{ secrets.GITHUB_TOKEN }}" + commentOnDirty: "This pull request has conflicts, please resolve those before we can evaluate the pull request." + commentOnClean: "Conflicts have been resolved. A maintainer will review the pull request shortly." From bda6721135cff50831ebf58e93dfdeffdc2fb820 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20K=C3=B6nig?= Date: Wed, 14 Dec 2022 21:54:28 +0100 Subject: [PATCH 02/13] Use github cli to sync master back to development MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Christian König --- .github/workflows/sync-back-to-dev.yml | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/.github/workflows/sync-back-to-dev.yml b/.github/workflows/sync-back-to-dev.yml index f689ae364..3a5133f9f 100644 --- a/.github/workflows/sync-back-to-dev.yml +++ b/.github/workflows/sync-back-to-dev.yml @@ -13,15 +13,6 @@ jobs: - name: Checkout uses: actions/checkout@v3.1.0 - name: Opening pull request - id: pull - uses: tretuna/sync-branches@1.4.0 - with: + run: gh pr create -B development -H master --title 'Sync master back into development' --body 'Created by Github action' --label 'internal' + env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - FROM_BRANCH: 'master' - TO_BRANCH: 'development' - - name: Label the pull request to ignore for release note generation - uses: actions-ecosystem/action-add-labels@v1.1.3 - with: - labels: internal - repo: ${{ github.repository }} - number: ${{ steps.pull.outputs.PULL_REQUEST_NUMBER }} From 61047520d1262aa6edf1598ffa229f92df684013 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 17 Dec 2022 10:01:11 +0000 Subject: [PATCH 03/13] Bump actions/checkout from 3.1.0 to 3.2.0 Bumps [actions/checkout](https://github.com/actions/checkout) from 3.1.0 to 3.2.0. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v3.1.0...v3.2.0) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/build.yml | 6 +++--- .github/workflows/codespell.yml | 2 +- .github/workflows/sync-back-to-dev.yml | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 38c040e4d..e860cd9fd 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -24,7 +24,7 @@ jobs: steps: - name: Checkout code - uses: actions/checkout@v3.1.0 + uses: actions/checkout@v3.2.0 - name: "Calculate required variables" id: variables @@ -88,7 +88,7 @@ jobs: steps: - name: Checkout code - uses: actions/checkout@v3.1.0 + uses: actions/checkout@v3.2.0 - name: "Fix ownership of repository" run: chown -R root . @@ -131,7 +131,7 @@ jobs: steps: - name: Checkout code - uses: actions/checkout@v3.1.0 + uses: actions/checkout@v3.2.0 - name: Get Binaries built in previous jobs uses: actions/download-artifact@v3.0.1 diff --git a/.github/workflows/codespell.yml b/.github/workflows/codespell.yml index 4930242cd..49a307974 100644 --- a/.github/workflows/codespell.yml +++ b/.github/workflows/codespell.yml @@ -10,7 +10,7 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v3.1.0 + uses: actions/checkout@v3.2.0 - name: Spell-Checking uses: codespell-project/actions-codespell@master diff --git a/.github/workflows/sync-back-to-dev.yml b/.github/workflows/sync-back-to-dev.yml index f689ae364..88f0f3595 100644 --- a/.github/workflows/sync-back-to-dev.yml +++ b/.github/workflows/sync-back-to-dev.yml @@ -11,7 +11,7 @@ jobs: name: Syncing branches steps: - name: Checkout - uses: actions/checkout@v3.1.0 + uses: actions/checkout@v3.2.0 - name: Opening pull request id: pull uses: tretuna/sync-branches@1.4.0 From df399e3014cea8271c3a55423f53c46b53cb87da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20K=C3=B6nig?= Date: Thu, 22 Dec 2022 22:20:11 +0100 Subject: [PATCH 04/13] Be honest MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Christian König --- .github/workflows/merge-conflict.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/merge-conflict.yml b/.github/workflows/merge-conflict.yml index 971ecb884..6722d665b 100644 --- a/.github/workflows/merge-conflict.yml +++ b/.github/workflows/merge-conflict.yml @@ -18,4 +18,4 @@ jobs: dirtyLabel: "Merge conflicts" repoToken: "${{ secrets.GITHUB_TOKEN }}" commentOnDirty: "This pull request has conflicts, please resolve those before we can evaluate the pull request." - commentOnClean: "Conflicts have been resolved. A maintainer will review the pull request shortly." + commentOnClean: "Conflicts have been resolved." From fbdb2e65c9640a7ea5fad3780e48d9f531f972e5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 24 Dec 2022 10:01:21 +0000 Subject: [PATCH 05/13] Bump actions/stale from 6.0.1 to 7.0.0 Bumps [actions/stale](https://github.com/actions/stale) from 6.0.1 to 7.0.0. - [Release notes](https://github.com/actions/stale/releases) - [Changelog](https://github.com/actions/stale/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/stale/compare/v6.0.1...v7.0.0) --- updated-dependencies: - dependency-name: actions/stale dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/stale.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml index 27db3ded5..9c3c9829b 100644 --- a/.github/workflows/stale.yml +++ b/.github/workflows/stale.yml @@ -13,7 +13,7 @@ jobs: issues: write steps: - - uses: actions/stale@v6.0.1 + - uses: actions/stale@v7.0.0 with: repo-token: ${{ secrets.GITHUB_TOKEN }} days-before-stale: 30 From f0b133b28568288fdf2906ca4f748bb40c1213d6 Mon Sep 17 00:00:00 2001 From: DL6ER Date: Tue, 27 Dec 2022 07:31:39 +0100 Subject: [PATCH 06/13] Always store time we start to save to the database (not only in debug mode). This avoids errorneous timing reports in case of errors. Signed-off-by: DL6ER --- src/database/query-table.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/database/query-table.c b/src/database/query-table.c index 961cb1329..d4d575654 100644 --- a/src/database/query-table.c +++ b/src/database/query-table.c @@ -63,8 +63,7 @@ int DB_save_queries(sqlite3 *db) return DB_FAILED; // Start database timer - if(config.debug & DEBUG_DATABASE) - timer_start(DATABASE_WRITE_TIMER); + timer_start(DATABASE_WRITE_TIMER); // Open pihole-FTL.db database file if needed bool db_opened = false; From 3a6f7e14cad4479b80e83ba7853c6df2fcbc95ef Mon Sep 17 00:00:00 2001 From: Adam Warner Date: Sat, 7 Jan 2023 13:10:43 +0000 Subject: [PATCH 07/13] Don't run the `Transfer Builds to Pi-hole Server...` step for dependabot PRs --- .github/workflows/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e860cd9fd..785bfe711 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -151,6 +151,7 @@ jobs: known-hosts: ${{ secrets.KNOWN_HOSTS }} - name: Transfer Builds to Pi-hole server for pihole checkout + if: github.actor != 'dependabot' env: USER: ${{ secrets.SSH_USER }} HOST: ${{ secrets.SSH_HOST }} From 2f67c59fbe25035501bbf57a670ea628583fe6be Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 7 Jan 2023 10:01:05 +0000 Subject: [PATCH 08/13] Bump actions/checkout from 3.2.0 to 3.3.0 Bumps [actions/checkout](https://github.com/actions/checkout) from 3.2.0 to 3.3.0. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v3.2.0...v3.3.0) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/build.yml | 6 +++--- .github/workflows/codespell.yml | 2 +- .github/workflows/sync-back-to-dev.yml | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 785bfe711..ffccca15d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -24,7 +24,7 @@ jobs: steps: - name: Checkout code - uses: actions/checkout@v3.2.0 + uses: actions/checkout@v3.3.0 - name: "Calculate required variables" id: variables @@ -88,7 +88,7 @@ jobs: steps: - name: Checkout code - uses: actions/checkout@v3.2.0 + uses: actions/checkout@v3.3.0 - name: "Fix ownership of repository" run: chown -R root . @@ -131,7 +131,7 @@ jobs: steps: - name: Checkout code - uses: actions/checkout@v3.2.0 + uses: actions/checkout@v3.3.0 - name: Get Binaries built in previous jobs uses: actions/download-artifact@v3.0.1 diff --git a/.github/workflows/codespell.yml b/.github/workflows/codespell.yml index 49a307974..7b0553a67 100644 --- a/.github/workflows/codespell.yml +++ b/.github/workflows/codespell.yml @@ -10,7 +10,7 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v3.2.0 + uses: actions/checkout@v3.3.0 - name: Spell-Checking uses: codespell-project/actions-codespell@master diff --git a/.github/workflows/sync-back-to-dev.yml b/.github/workflows/sync-back-to-dev.yml index 889f9622b..89b6323f4 100644 --- a/.github/workflows/sync-back-to-dev.yml +++ b/.github/workflows/sync-back-to-dev.yml @@ -11,7 +11,7 @@ jobs: name: Syncing branches steps: - name: Checkout - uses: actions/checkout@v3.2.0 + uses: actions/checkout@v3.3.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: From ac969d8524481e84cf59b792988734360c374c84 Mon Sep 17 00:00:00 2001 From: Adam Warner Date: Sat, 7 Jan 2023 13:10:43 +0000 Subject: [PATCH 09/13] Don't run the `Transfer Builds to Pi-hole Server...` step for dependabot PRs --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ffccca15d..e0959b372 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -151,7 +151,7 @@ jobs: known-hosts: ${{ secrets.KNOWN_HOSTS }} - name: Transfer Builds to Pi-hole server for pihole checkout - if: github.actor != 'dependabot' + if: github.actor != 'dependabot[bot]' env: USER: ${{ secrets.SSH_USER }} HOST: ${{ secrets.SSH_HOST }} From 9144f4b8218641873b4dcf31c17e63d681cfc3fc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 7 Jan 2023 10:00:59 +0000 Subject: [PATCH 10/13] Bump actions/upload-artifact from 3.1.1 to 3.1.2 Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 3.1.1 to 3.1.2. - [Release notes](https://github.com/actions/upload-artifact/releases) - [Commits](https://github.com/actions/upload-artifact/compare/v3.1.1...v3.1.2) --- updated-dependencies: - dependency-name: actions/upload-artifact dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e0959b372..4bb9cd43a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -119,7 +119,7 @@ jobs: - name: Upload artifacts to job for later processing if: github.event_name != 'pull_request' - uses: actions/upload-artifact@v3.1.1 + uses: actions/upload-artifact@v3.1.2 with: name: tmp-binary-storage path: '${{ matrix.bin_name }}*' From 031c137a3bbf51107765d7f740e1de284205232e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 7 Jan 2023 13:41:14 +0000 Subject: [PATCH 11/13] Bump actions/download-artifact from 3.0.1 to 3.0.2 Bumps [actions/download-artifact](https://github.com/actions/download-artifact) from 3.0.1 to 3.0.2. - [Release notes](https://github.com/actions/download-artifact/releases) - [Commits](https://github.com/actions/download-artifact/compare/v3.0.1...v3.0.2) --- updated-dependencies: - dependency-name: actions/download-artifact dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4bb9cd43a..83b66bfed 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -134,7 +134,7 @@ jobs: uses: actions/checkout@v3.3.0 - name: Get Binaries built in previous jobs - uses: actions/download-artifact@v3.0.1 + uses: actions/download-artifact@v3.0.2 id: download with: name: tmp-binary-storage From 6bb3927e7aa18c59779c332e8911b19b9fcc1159 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20K=C3=B6nig?= Date: Sun, 8 Jan 2023 22:20:36 +0100 Subject: [PATCH 12/13] Remove gray color in help output MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Christian König --- src/args.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/src/args.c b/src/args.c index 2df77a883..e5917f154 100644 --- a/src/args.c +++ b/src/args.c @@ -65,7 +65,6 @@ const char** argv_dnsmasq = NULL; #define COL_ULINE "\x1b[4m" // underline font #define COL_GREEN "\x1b[32m" // normal foreground color #define COL_YELLOW "\x1b[33m" // normal foreground color -#define COL_GRAY "\x1b[90m" // bright foreground color #define COL_RED "\x1b[91m" // bright foreground color #define COL_BLUE "\x1b[94m" // bright foreground color #define COL_PURPLE "\x1b[95m" // bright foreground color @@ -431,7 +430,6 @@ void parse_args(int argc, char* argv[]) const char *normal = cli_normal(); const char *blue = cli_color(COL_BLUE); const char *cyan = cli_color(COL_CYAN); - const char *gray = cli_color(COL_GRAY); const char *green = cli_color(COL_GREEN); const char *yellow = cli_color(COL_YELLOW); const char *purple = cli_color(COL_PURPLE); @@ -458,8 +456,8 @@ void parse_args(int argc, char* argv[]) printf(" Example: %spihole-FTL regex-test %ssomebad.domain %sbad%s\n", green, blue, cyan, normal); printf(" to test %ssomebad.domain%s against %sbad%s\n\n", blue, normal, cyan, normal); - printf(" An optional %s-q%s prevents any output (exit code testing):\n", gray, normal); - printf(" %spihole-FTL %s-q%s regex-test %ssomebad.domain %sbad%s\n\n", green, gray, green, blue, cyan, normal); + printf(" An optional %s-q%s prevents any output (exit code testing):\n", purple, normal); + printf(" %spihole-FTL %s-q%s regex-test %ssomebad.domain %sbad%s\n\n", green, purple, green, blue, cyan, normal); printf("%sEmbedded Lua engine:%s\n", yellow, normal); printf("\t%s--lua%s, %slua%s FTL's lua interpreter\n", green, normal, green, normal); @@ -476,10 +474,10 @@ void parse_args(int argc, char* argv[]) printf(" the script.\n\n"); printf("%sEmbedded SQLite3 shell:%s\n", yellow, normal); - printf("\t%ssql %s[-h]%s, %ssqlite3 %s[-h]%s FTL's SQLite3 shell\n", green, gray, normal, green, gray, normal); - printf("\t%s-h%s starts a special %shuman-readable mode%s\n\n", gray, normal, bold, normal); + printf("\t%ssql %s[-h]%s, %ssqlite3 %s[-h]%s FTL's SQLite3 shell\n", green, purple, normal, green, purple, normal); + printf("\t%s-h%s starts a special %shuman-readable mode%s\n\n", purple, normal, bold, normal); - printf(" Usage: %spihole-FTL sqlite3 %s[-h] %s[OPTIONS] [FILENAME] [SQL]%s\n\n", green, gray, cyan, normal); + printf(" Usage: %spihole-FTL sqlite3 %s[-h] %s[OPTIONS] [FILENAME] [SQL]%s\n\n", green, purple, cyan, normal); printf(" Options:\n\n"); printf(" - %s[OPTIONS]%s is an optional set of options. All available\n", cyan, normal); printf(" options can be found in %spihole-FTL sqlite3 --help%s\n", green, normal); From 6333d4c2cd2ca25be03fcb54d147ce5e3a103b91 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 14 Jan 2023 10:00:49 +0000 Subject: [PATCH 13/13] Bump benoitchantre/setup-ssh-authentication-action from 1.0.0 to 1.0.1 Bumps [benoitchantre/setup-ssh-authentication-action](https://github.com/benoitchantre/setup-ssh-authentication-action) from 1.0.0 to 1.0.1. - [Release notes](https://github.com/benoitchantre/setup-ssh-authentication-action/releases) - [Changelog](https://github.com/benoitchantre/setup-ssh-authentication-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/benoitchantre/setup-ssh-authentication-action/compare/1.0.0...1.0.1) --- updated-dependencies: - dependency-name: benoitchantre/setup-ssh-authentication-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 83b66bfed..504706901 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -145,7 +145,7 @@ jobs: working-directory: ${{steps.download.outputs.download-path}} - name: Install SSH Key - uses: benoitchantre/setup-ssh-authentication-action@1.0.0 + uses: benoitchantre/setup-ssh-authentication-action@1.0.1 with: private-key: ${{ secrets.SSH_KEY }} known-hosts: ${{ secrets.KNOWN_HOSTS }}