Remove duplicate code (again)

.github/workflows/lint-and-test.yml

@@ -57,13 +57,13 @@ jobs:
         continue-on-error: ${{ matrix.experimental }}
         strategy:
             matrix:
-                php: ['8.2', '8.1', '8.0', '7.4', '7.3', '7.2', '7.1', '7.0']
-                wp: ['latest']
+                php: ['8.1', '8.0', '7.4', '7.3', '7.2', '7.1', '7.0']
+                wp: ['6.4']
                 coverage: [false]
                 experimental: [false]
                 include:
-                    - php: '8.0'
-                      wp: 'latest'
+                    - php: '8.2'
+                      wp: '6.4'
                       coverage: true
                       experimental: false
 
@@ -73,6 +73,7 @@ jobs:
 
                     - php: '8.3'
                       wp: 'trunk'
+                      coverage: true
                       experimental: true
 
         steps:
@@ -131,21 +132,21 @@ jobs:
               uses: codecov/codecov-action@v3.1.4
               with:
                   file: coverage.xml
-                  flags: default
+                  flags: ${{ matrix.wp == 'trunk' && 'trunk,unit' || 'default'  }}
               if: ${{ matrix.coverage }}
 
             - name: Upload code coverage report
               uses: codecov/codecov-action@v3.1.4
               with:
                   file: coverage-integration.xml
-                  flags: default
+                  flags: ${{ matrix.wp == 'trunk' && 'trunk,integration' || 'integration'  }}
               if: ${{ matrix.coverage }}
 
             - name: Upload code coverage report
               uses: codecov/codecov-action@v3.1.4
               with:
                   file: coverage-integration-multisite.xml
-                  flags: multisite
+                  flags: ${{ matrix.wp == 'trunk' && 'trunk,multisite' || 'multisite'  }}
               if: ${{ matrix.coverage }}
 
     phpbench: