Merge pull request #3 from fr3nch13/dev

Changing the regex to find the active branch name.
fr3nch13 · Feb 25, 2023 · c1541a2 · c1541a2
2 parents 14c0d6e + 1f07076
commit c1541a2
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 6 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -33,7 +33,9 @@ jobs:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
     - name: Composer install
-      run: composer install
+      run: |
+        composer config github-oauth.github.com ${{ secrets.ACTIONS_TOKEN }}
+        composer install
 
     - name: Run PHP CodeSniffer
       run: composer run-script cs-checkstyle | vendor/bin/cs2pr
@@ -60,7 +62,9 @@ jobs:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
     - name: Composer install
-      run: composer install
+      run: |
+        composer config github-oauth.github.com ${{ secrets.ACTIONS_TOKEN }}
+        composer install
 
     - name: Run PHP Analyzer
       run: composer run-script phpstan
@@ -87,7 +91,9 @@ jobs:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
     - name: Composer install
-      run: composer install
+      run: |
+        composer config github-oauth.github.com ${{ secrets.ACTIONS_TOKEN }}
+        composer install
 
     - name: Run PHPUnit
       run: composer run-script test
@@ -114,13 +120,15 @@ jobs:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
     - name: Composer install
-      run: composer install
+      run: |
+        composer config github-oauth.github.com ${{ secrets.ACTIONS_TOKEN }}
+        composer install
 
     - name: Run PHPUnit
       run:  composer run-script coverage-clover
 
     - name: Upload to Codecov
-      uses: codecov/codecov-action@v2
+      uses: codecov/codecov-action@v3
       with:
         token: ${{ secrets.CODECOV_TOKEN }}
         files: ./tmp/coverage.xml

diff --git a/tests/TestCase/View/Helper/VersionsHelperTest.php b/tests/TestCase/View/Helper/VersionsHelperTest.php
@@ -60,7 +60,7 @@ public function testRunGit(): void
     {
         $results = $this->Versions->runGit(['branch']);
         if (count($results) == 1) {
-            $this->assertMatchesRegularExpression('/^\*\s+\(main|master|HEAD\s+detached\s+at\s+[a-z0-9\/]+\)$/i', $results[0]);
+            $this->assertMatchesRegularExpression('/^\*\s+([\(\)\w\s\/]+)$/i', $results[0]);
         } else {
             $result = '';
             foreach ($results as $i => $line) {