! try action

elkarte · Apr 15, 2024 · 8918b7c · 8918b7c
1 parent 862a83e
commit 8918b7c
Show file tree

Hide file tree

Showing 7 changed files with 38 additions and 23 deletions.
diff --git a/.github/phpunit-mariadb.xml b/.github/phpunit-mariadb.xml
@@ -30,7 +30,7 @@
           <directory suffix=".php">../sources/ext</directory>
       </exclude>
       <report>
-          <clover outputFile="/tmp/madb.xml"/>
+          <clover outputFile="/home/runner/work/Elkarte/Elkarte/elkarte/tmp/db.xml"/>
       </report>
   </coverage>
 

diff --git a/.github/phpunit-mysql.xml b/.github/phpunit-mysql.xml
@@ -30,7 +30,7 @@
           <directory suffix=".php">../sources/ext</directory>
       </exclude>
       <report>
-          <clover outputFile="/tmp/mydb.xml"/>
+          <clover outputFile="/home/runner/work/Elkarte/Elkarte/elkarte/tmp/db.xml"/>
       </report>
   </coverage>
 

diff --git a/.github/phpunit-postgres.xml b/.github/phpunit-postgres.xml
@@ -30,7 +30,7 @@
           <directory suffix=".php">../sources/ext</directory>
       </exclude>
       <report>
-          <clover outputFile="/tmp/pgdb.xml"/>
+          <clover outputFile="/home/runner/work/Elkarte/Elkarte/elkarte/tmp/db.xml"/>
       </report>
   </coverage>
 

diff --git a/.github/phpunit-webtest.xml b/.github/phpunit-webtest.xml
@@ -26,7 +26,7 @@
           <directory suffix=".php">../sources/ext</directory>
       </exclude>
       <report>
-          <clover outputFile="/tmp/web.xml"/>
+          <clover outputFile="/home/runner/work/Elkarte/Elkarte/elkarte/tmp/web.xml"/>
       </report>
   </coverage>
 

diff --git a/.github/setup-failure.sh b/.github/setup-failure.sh
@@ -8,7 +8,7 @@ set -e
 set +x
 
 # Agents will merge all coverage data...
-if [[ "${GITHUB_EVENT_NAME}" == "pull_request" ]]
-then
-    bash <(curl -s https://codecov.io/bash) -s "/tmp" -f '*.xml' -t "$CODECOV_TOKEN"
-fi
+#if [[ "${GITHUB_EVENT_NAME}" == "pull_request" ]]
+#then
+#    bash <(curl -s https://codecov.io/bash) -s "/tmp" -f '*.xml' -t "$CODECOV_TOKEN"
+#fi
diff --git a/.github/setup-results.sh b/.github/setup-results.sh
@@ -12,7 +12,7 @@ CONFIG="--verbose --configuration .github/phpunit-$DB.xml"
 vendor/bin/phpunit ${CONFIG}
 
 # Agents will merge all coverage data...
-if [[ "${GITHUB_EVENT_NAME}" == "pull_request" ]]
-then
-    bash <(curl -s https://codecov.io/bash) -s "/tmp" -f '*.xml' -t "$CODECOV_TOKEN"
-fi
+#if [[ "${GITHUB_EVENT_NAME}" == "pull_request" ]]
+#then
+#    bash <(curl -s https://codecov.io/bash) -s "/tmp" -f '*.xml' -t "$CODECOV_TOKEN"
+#fi
diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
@@ -75,24 +75,24 @@ jobs:
           DB: ${{ matrix.db }}
           PHP_VERSION: ${{ matrix.php }}
           WEBSERVER: 'nginx'
-        run: .github/setup-elkarte.sh $DB $PHP_VERSION
+        run: .github/setup-elkarte.sh
         working-directory: ./elkarte
 
       - name: Run Unit Tests
         env:
           DB: ${{ matrix.db }}
           PHP_VERSION: ${{ matrix.php }}
-        run: .github/setup-selenium.sh $DB $PHP_VERSION
+        run: .github/setup-selenium.sh
         working-directory: ./elkarte
         continue-on-error: true
 
-      - name: Code Coverage
-        env:
-          DB: ${{ matrix.db }}
-          PHP_VERSION: ${{ matrix.php }}
-          CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
-        run: .github/setup-failure.sh
-        working-directory: ./elkarte
+      - name: Send Coverage Reports
+        if: ${{ github.event_name == 'pull_request' }}
+        uses: codecov/codecov-action@v4
+        with:
+          files: /home/runner/work/Elkarte/Elkarte/elkarte/tmp/web.xml
+          token: ${{ secrets.CODECOV_TOKEN }}
+          verbose: false
 
       - name: Server Error Log
         env:
@@ -138,7 +138,7 @@ jobs:
         env:
           DB: ${{ matrix.db }}
           PHP_VERSION: ${{ matrix.php }}
-        run: .github/setup-elkarte.sh $DB $PHP_VERSION
+        run: .github/setup-elkarte.sh
         working-directory: ./elkarte
 
       - name: Install NodeJS
@@ -237,9 +237,16 @@ jobs:
         env:
           DB: ${{steps.database-type.outputs.db}}
           PHP_VERSION: ${{ matrix.php }}
-          CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
         run: .github/setup-results.sh
         working-directory: ./elkarte
+
+      - name: Send Coverage Reports
+        if: ${{ github.event_name == 'pull_request' }}
+        uses: codecov/codecov-action@v4
+        with:
+          files: /home/runner/work/Elkarte/Elkarte/elkarte/tmp/db.xml
+          token: ${{ secrets.CODECOV_TOKEN }}
+          verbose: false
   # END MySQL and MariaDB Job
 
   # START Postgres Tests
@@ -320,4 +327,12 @@ jobs:
           CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
         run: .github/setup-results.sh
         working-directory: ./elkarte
+
+      - name: Send Coverage Reports
+        if: ${{ github.event_name == 'pull_request' }}
+        uses: codecov/codecov-action@v4
+        with:
+          files: /home/runner/work/Elkarte/Elkarte/elkarte/tmp/db.xml
+          token: ${{ secrets.CODECOV_TOKEN }}
+          verbose: false
   # END Postgres Job