Merge pull request #553 from ergebnis/feature/synchronize

Enhancement: Synchronize with ergebnis/php-library-template
ergebnis · Sep 22, 2020 · ef97bd8 · ef97bd8
2 parents 9a55459 + 1dc856e
commit ef97bd8
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/.github/actions/composer/composer/install/run.sh b/.github/actions/composer/composer/install/run.sh
@@ -5,19 +5,19 @@ dependencies="${COMPOSER_INSTALL_DEPENDENCIES}"
 if [[ ${dependencies} == "lowest" ]]; then
   composer update --no-interaction --no-progress --no-suggest --prefer-lowest
 
-  exit 0
+  exit $?
 fi
 
 if [[ ${dependencies} == "locked" ]]; then
   composer install --no-interaction --no-progress --no-suggest
 
-  exit 0
+  exit $?
 fi
 
 if [[ ${dependencies} == "highest" ]]; then
   composer update --no-interaction --no-progress --no-suggest
 
-  exit 0
+  exit $?
 fi
 
 echo "::error::The value for the \"dependencies\" input needs to be one of \"lowest\", \"locked\"', \"highest\"' - got \"${dependencies}\" instead."

diff --git a/.github/dependabot.yml → .github/dependabot.yaml b/.github/dependabot.yml → .github/dependabot.yaml
diff --git a/.github/workflows/integrate.yaml b/.github/workflows/integrate.yaml
@@ -90,7 +90,7 @@ jobs:
         uses: "actions/cache@v2.1.1"
         with:
           path: ".build/php-cs-fixer"
-          key: "php-${{ matrix.php-version }}-php-cs-fixer-${{ hashFiles('composer.lock') }}"
+          key: "php-${{ matrix.php-version }}-php-cs-fixer-${{ github.sha }}"
           restore-keys: "php-${{ matrix.php-version }}-php-cs-fixer-"
 
       - name: "Run friendsofphp/php-cs-fixer"

diff --git a/.github/workflows/renew.yaml b/.github/workflows/renew.yaml
@@ -63,7 +63,7 @@ jobs:
         uses: "actions/cache@v2.1.1"
         with:
           path: ".build/php-cs-fixer"
-          key: "php-${{ matrix.php-version }}-php-cs-fixer-${{ hashFiles('composer.lock') }}"
+          key: "php-${{ matrix.php-version }}-php-cs-fixer-${{ github.sha }}"
           restore-keys: "php-${{ matrix.php-version }}-php-cs-fixer-"
 
       - name: "Run friendsofphp/php-cs-fixer"