Merge pull request #79 from pressbooks/update-pipeline

Release candidate
pressbooks · May 4, 2022 · f092cc4 · f092cc4
2 parents d290f2d + 23411fd
commit f092cc4
Show file tree

Hide file tree

Showing 6 changed files with 1,092 additions and 323 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -14,9 +14,9 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: [7.3, 7.4]
+        php: [7.4]
         os: [ubuntu-20.04]
-        wordpress: [5.9]
+        wordpress: [5.9.3, latest]
         experimental: [false]
         include:
           - php: 8.0
@@ -44,21 +44,12 @@ jobs:
           path: node_modules
           key: ${{ runner.OS }}-build-${{ hashFiles('**/package-lock.json') }}
 
-      - name: Setup PHP
-        uses: shivammathur/setup-php@v2
-        with:
-          php-version: ${{ matrix.php }}
-          tools: composer:v1
-          coverage: pcov
-        if: matrix.experimental == false
-
       - name: Setup PHP with Composer 2
         uses: shivammathur/setup-php@v2
         with:
           php-version: ${{ matrix.php }}
           tools: composer
           coverage: pcov
-        if: matrix.experimental == true
 
       - name: Install Node dependencies
         run: |
@@ -87,11 +78,11 @@ jobs:
 
       - name: Run PHP Tests
         run: composer test
-        if: matrix.php != 7.3
+        if: matrix.experimental == true
 
       - name: Run PHP Tests and PCOV
         run: composer test-coverage
-        if: matrix.experimental == false && matrix.php == 7.3
+        if: matrix.experimental == false
 
       - name: Upload Coverage to Codecov
         run: bash <(curl -s https://codecov.io/bash)

diff --git a/README.md b/README.md
@@ -1,16 +1,16 @@
-# Pressbooks CAS Single Sign-On 
-**Contributors:** conner_bw, greatislander  
-**Tags:** pressbooks, sso, cas  
-**Requires at least:** 5.2.2  
-**Tested up to:** 5.2.2  
-**Stable tag:** 1.2.3  
-**License:** GPLv3 or later  
-**License URI:** https://www.gnu.org/licenses/gpl-3.0.html  
+# Pressbooks CAS Single Sign-On
 
-CAS Single Sign-On integration for Pressbooks.
+**Contributors:** conner_bw, greatislander \
+**Tags:** pressbooks, sso, cas \
+**Requires at least:** 5.9.3 \
+**Tested up to:** 5.9.3 \
+**Stable tag:** 1.2.4 \
+**License:** GPLv3 or later \
+**License URI:** https://www.gnu.org/licenses/gpl-3.0.html
 
+CAS Single Sign-On integration for Pressbooks.
 
-## Description 
+## Description
 
 [![Packagist](https://img.shields.io/packagist/v/pressbooks/pressbooks-cas-sso.svg?style=flat-square)](https://packagist.org/packages/pressbooks/pressbooks-cas-sso) [![GitHub release](https://img.shields.io/github/release/pressbooks/pressbooks-cas-sso.svg?style=flat-square)](https://github.com/pressbooks/pressbooks-cas-sso/releases) [![Travis](https://img.shields.io/travis/pressbooks/pressbooks-cas-sso.svg?style=flat-square)](https://travis-ci.org/pressbooks/pressbooks-cas-sso/) [![Codecov](https://img.shields.io/codecov/c/github/pressbooks/pressbooks-cas-sso.svg?style=flat-square)](https://codecov.io/gh/pressbooks/pressbooks-cas-sso)
 
@@ -21,8 +21,7 @@ network. If we match a Pressbooks user by CAS username (stored in user_meta tabl
 user by email (and store a successful match in user_meta table for next time). If the CAS user does not have an account in Pressbooks, a new user can be created, or access can be
 refused, depending on the configuration.
 
-
-## Installation 
+## Installation
 
 ```
 composer require pressbooks/pressbooks-cas-sso
@@ -34,36 +33,35 @@ Then, activate and configure the plugin at the Network level.
 
 Read the integrations documentation for more info: https://docs.pressbooks.org/integrations/cas-sso/
 
-
-### Security Considerations 
+### Security Considerations
 
 Set the `PB_CAS_CERT_PATH` environment variable to configure validation of the CAS server. Used by `CURLOPT_CAINFO` for peer and host verification:
 
     putenv( 'PB_CAS_CERT_PATH=/path/to/cachain.pem' ); // Path to the CA chain that issued the CAS server certificate
 
-
-### Advanced Configuration 
+### Advanced Configuration
 
 The email can be filtered, example: `add_filter( 'pb_integrations_multidomain_email', function( $email, $uid, $plugin ) { /* Custom use case, return $email */ }, 10, 3 );`
 
 Because this plugin uses the fabulous [apereo/phpCAS](https://github.com/apereo/phpCAS) library, [many other configuration variables can be tweaked](https://github.com/apereo/phpCAS/tree/master/docs/examples).
 
-
-## Screenshots 
+## Screenshots
 
 ![Pressbooks CAS Administration.](screenshot-1.png)
 
+## Changelog
 
-## Changelog 
+### 1.2.4
 
-### 1.2.3 
-
-* See: https://github.com/pressbooks/pressbooks-cas-sso/releases/tag/1.2.3
+* See: https://github.com/pressbooks/pressbooks-cas-sso/releases/tag/1.2.4
 * Full release history available at: https://github.com/pressbooks/pressbooks-cas-sso/releases
 
+## Upgrade Notice
+
+### 1.2.4
 
-## Upgrade Notice 
+* Pressbooks CAS Single Sign-On requires Pressbooks >= 5.34.1
 
+### 1.2.3
 
-### 1.2.3 
 * Pressbooks CAS Single Sign-On requires Pressbooks >= 5.9.1
diff --git a/composer.json b/composer.json
@@ -19,19 +19,19 @@
   },
   "config": {
     "platform": {
-      "php": "7.3"
+      "php": "7.4"
     },
     "sort-packages": true
   },
   "require": {
-    "php": ">=7.3",
+    "php": ">=7.4",
     "apereo/phpcas": "^1.4",
-    "composer/installers": "^2.1",
-    "phpcompatibility/php-compatibility": "^9.3"
+    "composer/installers": "^2.1"
   },
   "require-dev": {
+    "phpcompatibility/php-compatibility": "^9.3",
     "pressbooks/coding-standards": "^1.1",
-    "wpreadme2markdown/wp2md": "^3.0",
+    "wpreadme2markdown/wp2md": "^4.0",
     "yoast/phpunit-polyfills": "^1.0.1"
   },
   "scripts": {