Merge branch 'master' into docs/kubernetes

docker-mailserver · Mar 12, 2024 · 9131bcb · 9131bcb
2 parents 5005dc4 + a04b53f
commit 9131bcb
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git a/.github/workflows/docs-preview-deploy.yml b/.github/workflows/docs-preview-deploy.yml
@@ -55,7 +55,7 @@ jobs:
           context: 'Deploy Preview (pull_request => workflow_run)'
 
       - name: 'Send preview build to Netlify'
-        uses: nwtgck/actions-netlify@v2.1
+        uses: nwtgck/actions-netlify@v3.0
         id: preview
         timeout-minutes: 1
         env:

diff --git a/.github/workflows/generic_build.yml b/.github/workflows/generic_build.yml
@@ -83,7 +83,7 @@ jobs:
 
       # NOTE: AMD64 can build within 2 minutes
       - name: 'Build images'
-        uses: docker/build-push-action@v5.1.0
+        uses: docker/build-push-action@v5.2.0
         with:
           context: .
           # Build at least the AMD64 image (which runs against the test suite).

diff --git a/.github/workflows/generic_publish.yml b/.github/workflows/generic_publish.yml
@@ -67,7 +67,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: 'Build and publish images'
-        uses: docker/build-push-action@v5.1.0
+        uses: docker/build-push-action@v5.2.0
         with:
           context: .
           build-args: |

diff --git a/.github/workflows/generic_test.yml b/.github/workflows/generic_test.yml
@@ -43,7 +43,7 @@ jobs:
       # Importing from the cache should create the image within approx 30 seconds:
       # NOTE: `qemu` step is not needed as we only test for AMD64.
       - name: 'Build AMD64 image from cache'
-        uses: docker/build-push-action@v5.1.0
+        uses: docker/build-push-action@v5.2.0
         with:
           context: .
           tags: mailserver-testing:ci

diff --git a/.github/workflows/generic_vulnerability-scan.yml b/.github/workflows/generic_vulnerability-scan.yml
@@ -42,7 +42,7 @@ jobs:
       # Importing from the cache should create the image within approx 30 seconds:
       # NOTE: `qemu` step is not needed as we only test for AMD64.
       - name: 'Build AMD64 image from cache'
-        uses: docker/build-push-action@v5.1.0
+        uses: docker/build-push-action@v5.2.0
         with:
           context: .
           tags: mailserver-testing:ci

diff --git a/test/config/rspamd_full/user-patches.sh b/test/config/rspamd_full/user-patches.sh
@@ -8,7 +8,7 @@
 echo "enable_test_patterns = true;" >>/etc/rspamd/local.d/options.inc
 
 # We want Dovecot to be very detailed about what it is doing,
-# specificially for Sieve because we need to check whether the
+# specifically for Sieve because we need to check whether the
 # Sieve scripts are executed so Rspamd is trained when using
 # `RSPAMD_LEARN=1`.
 echo 'mail_debug = yes' >>/etc/dovecot/dovecot.conf