Merge branch 'master' into windows-node16

haraka · Apr 18, 2022 · eadfada · eadfada
2 parents ec12282 + 1a02e03
commit eadfada
Show file tree

Hide file tree

Showing 14 changed files with 322 additions and 137 deletions.
diff --git a/.github/workflows/ci-test.yml b/.github/workflows/ci-test.yml
@@ -36,6 +36,9 @@ jobs:
       with:
         node-version: ${{ matrix.node-version }}
 
+    - name: Install bsdtar
+      run: sudo apt-get install -y libarchive-tools
+
     - name: Install
       run: npm install
 

diff --git a/.github/workflows/coveralls.yml b/.github/workflows/coveralls.yml
@@ -22,6 +22,7 @@ jobs:
 
     - name: install, run
       run: |
+        sudo apt-get install -y libarchive-tools
         npm install
         npm install --no-save nyc codecov
         npm run cover

diff --git a/Changes.md b/Changes.md
@@ -3,6 +3,7 @@
 
 ### Changes
 
+- fix attachment.js error handling with complex archive #3035
 - reformat dkim signature to multi-line #2991
 - add lots of `if (!transaction) return` in places #2732
 - use optional chaining when accessing transactions #2732