diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 99bb6aa4..19b6d844 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -28,7 +28,7 @@ OpenID Connect Generic Client is licensed under the GPLv2.0, and all contributio - Ensure you use LF line endings in your code editor. Use [EditorConfig](http://editorconfig.org/) if your editor supports it so that indentation, line endings and other settings are auto configured. - When committing, reference your issue number (#1234) and include a note about the fix. - Ensure that your code supports the minimum supported versions of PHP and WordPress; this is shown at the top of the `readme.txt` file. -- Push the changes to your fork and submit a pull request on the `dev` branch of the plugin repository. +- Push the changes to your fork and submit a pull request on the `develop` branch of the plugin repository. - Make sure to write good and detailed commit messages (see [this post](https://chris.beams.io/posts/git-commit/) for more on this) and follow all the applicable sections of the pull request template. - Please avoid modifying the changelog directly or updating the .pot files. These will be updated by the plugin team. diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 52bc7788..d55a9959 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -1,6 +1,6 @@ ### All Submissions: -* [ ] Have you followed the [plugin Contributing guideline](https://github.com/oidc-wp/openid-connect-generi/blob/dev/.github/CONTRIBUTING.md)? +* [ ] Have you followed the [plugin Contributing guideline](https://github.com/oidc-wp/openid-connect-generi/blob/develop/.github/CONTRIBUTING.md)? * [ ] Does your code follow the [WordPress' coding standards](https://make.wordpress.org/core/handbook/best-practices/coding-standards/)? * [ ] Have you checked to ensure there aren't other open [Pull Requests](../pulls) for the same update/change? diff --git a/.github/workflows/i18n.yml b/.github/workflows/i18n.yml index a4f59e3a..7c1e17a3 100644 --- a/.github/workflows/i18n.yml +++ b/.github/workflows/i18n.yml @@ -4,14 +4,14 @@ on: pull_request: push: branches: - - dev + - 'develop' - 'release/**' - 'feature/**' - 'fix/**' env: WP_MULTISITE: 0 - ACTION_VERSION: 2 + ACTION_VERSION: 3 jobs: check_i18n: diff --git a/.github/workflows/linting.yml b/.github/workflows/linting.yml index f0c6a7d7..6dcf72a5 100644 --- a/.github/workflows/linting.yml +++ b/.github/workflows/linting.yml @@ -4,16 +4,16 @@ on: pull_request: push: branches: - - dev + - 'develop' - 'release/**' - 'feature/**' - 'fix/**' env: - PHP_VERSION: '7.4' + PHP_VERSION: '8.0' WP_MULTISITE: 0 - COMPOSER_VERSION: '2.2' - ACTION_VERSION: 2 + COMPOSER_VERSION: '2.6' + ACTION_VERSION: 3 jobs: check_linting: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index e432ff93..55a0903e 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -6,7 +6,7 @@ on: env: WP_MULTISITE: 0 - ACTION_VERSION: 2 + ACTION_VERSION: 3 jobs: release: @@ -24,7 +24,7 @@ jobs: uses: actions/setup-node@v1 # https://github.com/marketplace/actions/setup-node-js-environment with: - node-version: 14.x + node-version: 16.x - name: Get NPM Cache Directory id: npm-cache diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml index 10fb40d7..b1025ec8 100644 --- a/.github/workflows/static-analysis.yml +++ b/.github/workflows/static-analysis.yml @@ -4,16 +4,16 @@ on: pull_request: push: branches: - - dev + - 'develop' - 'release/**' - 'feature/**' - 'fix/**' env: - PHP_VERSION: '7.4' + PHP_VERSION: '8.0' WP_MULTISITE: 0 - COMPOSER_VERSION: '2.2' - ACTION_VERSION: 2 + COMPOSER_VERSION: '2.6' + ACTION_VERSION: 3 jobs: check_static_analysis: diff --git a/.github/workflows/unit-testing.yml b/.github/workflows/unit-testing.yml index 2d0f2bef..83038f60 100644 --- a/.github/workflows/unit-testing.yml +++ b/.github/workflows/unit-testing.yml @@ -7,8 +7,8 @@ on: - 'release/**' env: - COMPOSER_VERSION: '2.2' - ACTION_VERSION: 2 + COMPOSER_VERSION: '2.6' + ACTION_VERSION: 3 jobs: matrix_unit_testing: