Merge pull request #279 from ergebnis/feature/synchronize

Enhancement: Synchronize with ergebnis/php-library-template
ergebnis · Dec 19, 2019 · 7ce899a · 7ce899a
2 parents 73cf9c6 + 12be78e
commit 7ce899a
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 18 deletions.
diff --git a/.dependabot/config.yml b/.dependabot/config.yml
@@ -3,10 +3,7 @@
 version: 1
 
 update_configs:
-  - automerged_updates:
-      - match:
-          dependency_type: "development"
-    default_assignees:
+  - default_assignees:
       - "localheinz"
     default_labels:
       - "dependency"
@@ -18,10 +15,6 @@ update_configs:
           dependency_name: "composer-plugin-api"
       - match:
           dependency_name: "composer/composer"
-      - match:
-          dependency_name: "localheinz/composer-json-normalizer"
-      - match:
-          dependency_name: "localheinz/json-normalizer"
     package_manager: "php:composer"
     update_schedule: "live"
     version_requirement_updates: "increase_versions"
diff --git a/.github/settings.yml b/.github/settings.yml
@@ -10,9 +10,9 @@ branches:
         required_approving_review_count: 1
       required_status_checks:
         contexts:
-          - "Coding Standards (7.2)"
-          - "Dependency Analysis (7.4)"
-          - "Static Code Analysis (7.4)"
+          - "Coding Standards (7.2, locked)"
+          - "Dependency Analysis (7.4, locked)"
+          - "Static Code Analysis (7.4, locked)"
           - "Tests (7.2, lowest)"
           - "Tests (7.2, locked)"
           - "Tests (7.2, highest)"
@@ -22,7 +22,7 @@ branches:
           - "Tests (7.4, lowest)"
           - "Tests (7.4, locked)"
           - "Tests (7.4, highest)"
-          - "Code Coverage (7.4)"
+          - "Code Coverage (7.4, locked)"
           - "codecov/patch"
           - "codecov/project"
         strict: false

diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
@@ -21,6 +21,9 @@ jobs:
         php-version:
           - 7.2
 
+        dependencies:
+          - locked
+
     steps:
       - name: "Checkout"
         uses: actions/checkout@v2.0.0
@@ -39,9 +42,9 @@ jobs:
         uses: actions/cache@v1.0.3
         with:
           path: ~/.composer/cache
-          key: php-${{ matrix.php-version }}-composer-locked-${{ hashFiles('**/composer.lock') }}
+          key: php-${{ matrix.php-version }}-composer-${{ matrix.dependencies }}-${{ hashFiles('**/composer.lock') }}
           restore-keys: |
-            php-${{ matrix.php-version }}-composer-locked-
+            php-${{ matrix.php-version }}-composer-${{ matrix.dependencies }}-
 
       - name: "Install locked dependencies with composer"
         run: composer install --no-interaction --no-progress --no-suggest
@@ -75,6 +78,9 @@ jobs:
         php-version:
           - 7.4
 
+        dependencies:
+          - locked
+
     steps:
       - name: "Checkout"
         uses: actions/checkout@v2.0.0
@@ -90,9 +96,9 @@ jobs:
         uses: actions/cache@v1.0.3
         with:
           path: ~/.composer/cache
-          key: php-${{ matrix.php-version }}-composer-locked-${{ hashFiles('**/composer.lock') }}
+          key: php-${{ matrix.php-version }}-composer-${{ matrix.dependencies }}-${{ hashFiles('**/composer.lock') }}
           restore-keys: |
-            php-${{ matrix.php-version }}-composer-locked-
+            php-${{ matrix.php-version }}-composer-${{ matrix.dependencies }}-
 
       - name: "Install locked dependencies with composer"
         run: composer install --no-interaction --no-progress --no-suggest
@@ -112,6 +118,9 @@ jobs:
         php-version:
           - 7.4
 
+        dependencies:
+          - locked
+
     steps:
       - name: "Checkout"
         uses: actions/checkout@v2.0.0
@@ -204,6 +213,9 @@ jobs:
         php-version:
           - 7.4
 
+        dependencies:
+          - locked
+
     steps:
       - name: "Checkout"
         uses: actions/checkout@v2.0.0
@@ -219,9 +231,9 @@ jobs:
         uses: actions/cache@v1.0.3
         with:
           path: ~/.composer/cache
-          key: php-${{ matrix.php-version }}-composer-locked-${{ hashFiles('**/composer.lock') }}
+          key: php-${{ matrix.php-version }}-composer-${{ matrix.dependencies }}-${{ hashFiles('**/composer.lock') }}
           restore-keys: |
-            php-${{ matrix.php-version }}-composer-locked-
+            php-${{ matrix.php-version }}-composer-${{ matrix.dependencies }}-
 
       - name: "Install locked dependencies with composer"
         run: composer install --no-interaction --no-progress --no-suggest