Merge pull request #91 from creasico/refactor/all

Refactor everything
creasico · Mar 30, 2024 · 52d9b8f · 52d9b8f
2 parents 7106331 + 83f286a
commit 52d9b8f
Show file tree

Hide file tree

Showing 80 changed files with 1,064 additions and 1,082 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -107,23 +107,23 @@ jobs:
 
       - name: Generate reports for CodeClimate
         id: reports
-        if: ${{ matrix.laravel == '10.x' && ( github.actor != 'dependabot[bot]' || needs.configs.outputs.should-reports == '1' ) }}
+        if: ${{ matrix.db == 'pgsql' && ( github.actor != 'dependabot[bot]' || needs.configs.outputs.should-reports == '1' ) }}
         env:
           COVERAGE_FILE: tests/reports/clover.xml
-          CODECLIMATE_REPORT: tests/reports/codeclimate.${{ matrix.php }}.json
+          CODECLIMATE_REPORT: tests/reports/codeclimate-${{ matrix.php }}-L${{ matrix.laravel }}.json
         run: |
           if [[ -n \"$CC_TEST_REPORTER_URL\" ]]; then
             curl -LSs $CC_TEST_REPORTER_URL > ./cc-test-reporter && chmod +x ./cc-test-reporter
             ./cc-test-reporter format-coverage -t clover -o $CODECLIMATE_REPORT $COVERAGE_FILE
             echo "has-reports=1" >> $GITHUB_OUTPUT
           fi
 
-      - name: Upload tests reports
+      - name: Upload reports for CodeClimate
         uses: actions/upload-artifact@v4
-        if: ${{ matrix.laravel == '10.x' && ( github.actor != 'dependabot[bot]' || needs.configs.outputs.should-reports == '1' ) }}
+        if: ${{ steps.reports.outputs.has-reports == '1' }}
         with:
-          name: test-reports-${{ matrix.php }}-${{ matrix.db }}
-          path: tests/reports
+          name: test-reports-${{ matrix.php }}-L${{ matrix.laravel }}
+          path: tests/reports/codeclimate-${{ matrix.php }}-L${{ matrix.laravel }}.json
 
   reports:
     name: Report Test Coverages
@@ -141,4 +141,4 @@ jobs:
       - name: Report to CodeClimate
         run: |
           curl -LSs $CC_TEST_REPORTER_URL > ./cc-test-reporter && chmod +x ./cc-test-reporter
-          ./cc-test-reporter sum-coverage -o - codeclimate.*.json | ./cc-test-reporter upload-coverage --input -
+          ./cc-test-reporter sum-coverage -o - codeclimate-*.json | ./cc-test-reporter upload-coverage --input -