Merge branch 'master' into feature/50-prevent-warnings-on-phpunit-50

rdohms · Feb 13, 2022 · 96fd5ea · 96fd5ea
2 parents e0f7d25 + 0afc0f2
commit 96fd5ea
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 11 deletions.
diff --git a/.github/workflows/check-cs.yml b/.github/workflows/check-cs.yml
@@ -10,6 +10,12 @@ on:
   # Allow manually triggering the workflow.
   workflow_dispatch:
 
+# Cancels all previous workflow runs for the same branch that have not yet completed.
+concurrency:
+  # The concurrency group contains the workflow name and the branch name.
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   fix-style:
     name: Fix Code Style
@@ -20,7 +26,7 @@ jobs:
 
     steps:
     - name: Checkout code
-      uses: actions/checkout@v2.3.4
+      uses: actions/checkout@v2.4.0
 
     - name: Setup PHP
       uses: shivammathur/setup-php@v2
@@ -31,7 +37,7 @@ jobs:
 
     - name: Install dependencies
       run: |
-        composer update --prefer-dist --no-suggest --no-progress
+        composer update --prefer-dist --no-suggest --no-progress --no-interaction
 
     - name: Check Code Style
       run: vendor/bin/phpcs --report-full --report-checkstyle=./phpcs-report.xml

diff --git a/.github/workflows/promote-tag.yml b/.github/workflows/promote-tag.yml
@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Checkout code
-      uses: actions/checkout@v2.3.4
+      uses: actions/checkout@v2.4.0
       with:
         ref: ${{ github.ref }}
     - name: Pick Release Version from git tag

diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
@@ -10,6 +10,12 @@ on:
   # Allow manually triggering the workflow.
   workflow_dispatch:
 
+# Cancels all previous workflow runs for the same branch that have not yet completed.
+concurrency:
+  # The concurrency group contains the workflow name and the branch name.
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   php-tests:
     runs-on: ubuntu-latest
@@ -19,7 +25,7 @@ jobs:
 
     strategy:
       matrix:
-        php: ['8.0', '7.4', '7.3', '7.2', '7.1', '7.0', '5.6', '5.5', '5.4']
+        php: ['8.1', '8.0', '7.4', '7.3', '7.2', '7.1', '7.0', '5.6', '5.5', '5.4']
         dependency-version: ['prefer-stable']
         experimental: [false]
 
@@ -36,8 +42,11 @@ jobs:
           - php: '8.0'
             dependency-version: 'prefer-lowest'
             experimental: false
-
           - php: '8.1'
+            dependency-version: 'prefer-lowest'
+            experimental: false
+
+          - php: '8.2'
             dependency-version: 'prefer-stable'
             experimental: true
 
@@ -46,7 +55,7 @@ jobs:
 
     steps:
     - name: Checkout code
-      uses: actions/checkout@v2.3.4
+      uses: actions/checkout@v2.4.0
 
     - name: Setup PHP
       uses: shivammathur/setup-php@v2
@@ -59,7 +68,7 @@ jobs:
     # Remove the coding standards package as it has a higher minimum PHP
     # requirement and would prevent running the tests on older PHP versions.
     - name: 'Composer: remove CS dependency'
-      run: composer remove --dev --no-update dms/coding-standard
+      run: composer remove --dev --no-update dms/coding-standard --no-interaction
 
     - name: 'Composer: update PHPUnit for testing lowest (PHP 7.2)'
       if: ${{ matrix.dependency-version == 'prefer-lowest' && matrix.php == '7.2' }}
@@ -70,14 +79,14 @@ jobs:
       run: composer require --no-update phpunit/phpunit:"^9.0" --no-interaction
 
     - name: Install dependencies - normal
-      if: ${{ matrix.php < 8.1 }}
+      if: ${{ matrix.php < 8.2 }}
       run: |
-        composer update --${{ matrix.dependency-version }} --prefer-dist --no-progress
+        composer update --${{ matrix.dependency-version }} --prefer-dist --no-progress --no-interaction
 
     - name: Install dependencies - ignore platform reqs
-      if: ${{ matrix.php >= 8.1 }}
+      if: ${{ matrix.php >= 8.2 }}
       run: |
-        composer update --${{ matrix.dependency-version }} --prefer-dist --no-progress --ignore-platform-reqs
+        composer update --${{ matrix.dependency-version }} --prefer-dist --no-progress --ignore-platform-reqs --no-interaction
 
     - name: Execute Unit Tests
       run: vendor/bin/phpunit