Workflow fixes for coveralls

bpacholek · Nov 19, 2019 · 33a444a · 33a444a
1 parent 193303c
commit 33a444a
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
@@ -9,7 +9,16 @@ jobs:
 
     steps:
     - uses: actions/checkout@v1
-
+      with:
+        ref: master
+
+    - name: reattach HEAD to Head Ref
+      run: git checkout "$(echo ${{ github.head_ref }} | sed -E 's|refs/[a-zA-Z]+/||')"
+      if: github.head_ref != ''
+    - name: reattach HEAD to Ref
+      run: git checkout "$(echo ${{ github.ref }} | sed -E 's|refs/[a-zA-Z]+/||')"
+      if: github.head_ref == ''
+
     - name: Setup PHP
       uses: shivammathur/setup-php@master
       with:

diff --git a/composer.json b/composer.json
@@ -29,7 +29,7 @@
         "phpunit/phpunit": "^7.5",
         "mikey179/vfsstream": "^1.6.8",
         "php-mock/php-mock-phpunit": "^2.5",
-        "satooshi/php-coveralls": "^2.1"
+        "php-coveralls/php-coveralls": "^2.1"
     },
     "autoload": {
         "psr-4": {
@@ -41,7 +41,7 @@
             "./vendor/phpunit/phpunit/phpunit"
         ],
         "generate-coveralls": [
-            "./vendor/satooshi/php-coveralls/bin/php-coveralls -v"
+            "./vendor/php-coveralls/php-coveralls/bin/php-coveralls -v"
         ]
 
     }