Merge branch 'release/v1.18.7'

axllent · Jun 22, 2024 · 9a3d0ca · 9a3d0ca
2 parents 7204964 + 4193489
commit 9a3d0ca
Show file tree

Hide file tree

Showing 40 changed files with 1,582 additions and 686 deletions.
diff --git a/.chglog/config.yml b/.chglog/config.yml
@@ -17,6 +17,24 @@ options:
       fix: Fix
     #   perf: Performance Improvements
     #   refactor: Code Refactoring
+    sort_by: Custom
+    title_order:
+      - Feature
+      - Chore
+      - UI
+      - API
+      - Libs
+      - Docker
+      - Security
+      - Fix
+      - Bugfix
+      - Docs
+      - Swagger
+      - Build
+      - Testing
+      - Test
+      - Tests
+      - Pull Requests
   header:
     pattern: "^(\\w*)(?:\\(([\\w\\$\\.\\-\\*\\s]*)\\))?\\:\\s(.*)$"
     pattern_maps:

diff --git a/.github/workflows/build-docker-edge.yml b/.github/workflows/build-docker-edge.yml
@@ -29,13 +29,16 @@ jobs:
         username: ${{ github.repository_owner }}
         password: ${{ github.token }}
 
+    - uses: benjlevesque/short-sha@v3.0
+      id: short-sha
+
     - name: Build and push
       uses: docker/build-push-action@v5
       with:
         context: .
         platforms: linux/386,linux/amd64,linux/arm64
         build-args: |
-          "VERSION=edge-${{ github.sha }}"
+          "VERSION=edge-${{ steps.short-sha.outputs.sha }}"
         push: true
         tags: |
           axllent/mailpit:edge

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -26,7 +26,7 @@ jobs:
         key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
         restore-keys: |
           ${{ runner.os }}-go-
-    - run: go test -p 1 ./internal/storage ./server ./internal/tools ./internal/html2text -v
+    - run: go test -p 1 ./internal/storage ./server ./server/pop3 ./internal/tools ./internal/html2text -v
     - run: go test -p 1 ./internal/storage ./internal/html2text -bench=.
 
     # build the assets