Merge 881709d into 894a3af

TYPO3 · Jan 31, 2022 · 72edbf7 · 72edbf7
2 parents 894a3af + 881709d
commit 72edbf7
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 5 deletions.
diff --git a/.github/workflows/code_coverage.yaml b/.github/workflows/code_coverage.yaml
@@ -19,7 +19,7 @@ jobs:
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
           restore-keys: |
             ${{ runner.os }}-composer-
-      - uses: shivammathur/setup-php@v1
+      - uses: shivammathur/setup-php@v2
         with:
           php-version: 7.3
           coverage: none

diff --git a/.github/workflows/phpstan.yaml b/.github/workflows/phpstan.yaml
@@ -22,7 +22,7 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-composer-
 
-      - uses: shivammathur/setup-php@v1
+      - uses: shivammathur/setup-php@v2
         with:
           php-version: 7.3
           coverage: none

diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
@@ -39,7 +39,7 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-composer-
 
-      - uses: shivammathur/setup-php@v1
+      - uses: shivammathur/setup-php@v2
         with:
           php-version: ${{ matrix.php }}
           coverage: none # disable xdebug, pcov

diff --git a/src/Task/Git/AbstractCheckoutTask.php b/src/Task/Git/AbstractCheckoutTask.php
@@ -39,7 +39,7 @@ protected function resolveSha1(Node $node, Deployment $deployment, array $option
             $sha1 = $this->shell->execute(
                 "git ls-remote --sort=version:refname {$options['repositoryUrl']} 'refs/tags/{$options['tag']}' "
                     . "| awk '{print $1 }' "
-                    . "| tail --lines=1",
+                    . '| tail --lines=1',
                 $node,
                 $deployment,
                 true

diff --git a/tests/Unit/Task/GitCheckoutTaskTest.php b/tests/Unit/Task/GitCheckoutTaskTest.php
@@ -52,7 +52,6 @@ public function executeWithEmptyOptionsAndValidSha1FetchesResetsCopiesAndCleansR
         $this->assertCommandExecuted('git clean -q -d -x -ff');
     }
 
-
     /**
      * @test
      */