Skip to content

Commit 98b5500

Browse files
authored
Merge pull request #4228 from oleibman/contrib
Update "Contributing" Notes and One Github Action
2 parents a8ff421 + 1983af6 commit 98b5500

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

.github/workflows/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ jobs:
210210
runs-on: ubuntu-latest
211211
steps:
212212
- name: Checkout
213-
uses: actions/checkout@v3
213+
uses: actions/checkout@v4
214214
with:
215215
fetch-depth: 0
216216

CONTRIBUTING.md

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,10 @@ This makes it easier to see exactly what is being tested when reviewing the PR.
4040
2. Tag subject must be the version number, eg: `1.2.3`
4141
3. Tag body must be a copy-paste of the changelog entries.
4242
3. Push the tag with `git push --tags`, GitHub Actions will create a GitHub release automatically, and the release details will automatically be sent to packagist.
43-
4. Github seems to remove markdown headings in the Release Notes, so you should edit to restore these.
43+
4. By default, Github remove markdown headings in the Release Notes. You can either edit to restore these, or, probably preferably, change the default comment character on your system - `git config core.commentChar ';'`.
4444

45-
> **Note:** Tagged releases are made from the `master` branch. Only in an emergency should a tagged release be made from the `release` branch. (i.e. cherry-picked hot-fixes.)
45+
> **Note:** Tagged releases are made from the `master` branch. Only in an emergency should a tagged release be made from the `release` branch. (i.e. cherry-picked hot-fixes.) However, there are 3 branches which have been updated to apply security patches, and those may be tagged if future security updates are needed.
46+
- release1291
47+
- release210
48+
- release222
4649

0 commit comments

Comments
 (0)