Skip to content

Commit

Permalink
chore: Updates documentation & GHA workflows to use develop branch (#…
Browse files Browse the repository at this point in the history
…506)

- Updates the GitHub Actions workflows to target the `develop` branch.
- Updates documentation to reference the `develop` branch.
  • Loading branch information
timnolte authored Dec 23, 2023
1 parent c2c73fd commit 960e5c5
Show file tree
Hide file tree
Showing 7 changed files with 16 additions and 16 deletions.
2 changes: 1 addition & 1 deletion .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down
2 changes: 1 addition & 1 deletion .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -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?

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/i18n.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/linting.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:

env:
WP_MULTISITE: 0
ACTION_VERSION: 2
ACTION_VERSION: 3

jobs:
release:
Expand All @@ -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
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/static-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/unit-testing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down

0 comments on commit 960e5c5

Please sign in to comment.