Skip to content

Commit de29757

Browse files
authored
Merge pull request #9 from iwf-web/develop
Prepare Release
2 parents 0a1fdc5 + 59ebb3a commit de29757

10 files changed

Lines changed: 31 additions & 19 deletions

File tree

.devcontainer/devcontainer.json

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -55,17 +55,8 @@
5555
"yzhang.markdown-all-in-one"
5656
],
5757
"settings": {
58-
"editor.formatOnSave": true,
59-
"[php]": {
60-
"editor.tabSize": 4,
61-
"editor.defaultFormatter": "junstyle.php-cs-fixer"
62-
},
6358
"php-cs-fixer.executablePath": "${workspaceFolder}/vendor/bin/php-cs-fixer",
64-
"php-cs-fixer.config": "${workspaceFolder}/.php-cs-fixer.dist.php",
65-
"php-cs-fixer.onsave": true,
66-
"markdown.extension.list.indentationSize": "adaptive",
67-
"markdown.extension.italic.indicator": "_",
68-
"markdown.extension.orderedList.marker": "one"
59+
"php-cs-fixer.config": "${workspaceFolder}/.php-cs-fixer.dist.php"
6960
}
7061
}
7162
}

.editorconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ indent_size = 4
4848
tab_width = 4
4949
ij_continuation_indent_size = 4
5050

51-
[{composer.json,.phpunit.result.cache,composer.lock}]
51+
[{.vscode/settings.json,composer.json,.phpunit.result.cache,composer.lock}]
5252
indent_size = 4
5353
tab_width = 4
5454
ij_continuation_indent_size = 4

.gitattributes

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,13 @@
44
# This is what is relevant for composer installs
55
.devcontainer export-ignore
66
.github export-ignore
7+
.vscode export-ignore
78
.editorconfig export-ignore
89
.gitignore export-ignore
910
.gitattributes export-ignore
1011
CODEOWNERS export-ignore
1112
*.md export-ignore
1213
*.dist.php export-ignore
1314
*release*.json export-ignore
15+
README.md -export-ignore export-subst
16+
CHANGELOG.md -export-ignore export-subst

.github/dependabot.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ version: 2
99
updates:
1010
- package-ecosystem: github-actions
1111
directory: /
12+
target-branch: develop
1213
labels:
1314
- "dependabot :robot:"
1415
schedule:
@@ -18,6 +19,7 @@ updates:
1819

1920
- package-ecosystem: devcontainers
2021
directory: /
22+
target-branch: develop
2123
labels:
2224
- "dependabot :robot:"
2325
schedule:
@@ -27,6 +29,7 @@ updates:
2729

2830
- package-ecosystem: composer
2931
directory: /
32+
target-branch: develop
3033
labels:
3134
- "dependabot :robot:"
3235
schedule:

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
id: composer-cache
2828
run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
2929
- name: Cache Composer dependencies
30-
uses: actions/cache@v4
30+
uses: actions/cache@v5
3131
with:
3232
path: ${{ steps.composer-cache.outputs.dir }}
3333
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}

.github/workflows/release.yml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,7 @@ jobs:
1616
steps:
1717
- name: Create Release PR
1818
uses: googleapis/release-please-action@v4
19-
#with:
20-
# # Bot PAT with access to Workflows
21-
# # The built-in GITHUB_TOKEN has cannot trigger other workflows
22-
# # Use custom token once banned iwf-web-bot is resolved
23-
# token: ${{ secrets.GH_PAT }}
19+
with:
20+
# Bot PAT with access to Workflows
21+
# The built-in GITHUB_TOKEN has cannot trigger other workflows
22+
token: ${{ secrets.GH_PAT }}

.vscode/settings.json

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
{
2+
"editor.formatOnSave": true,
3+
"[php]": {
4+
"editor.tabSize": 4,
5+
"editor.defaultFormatter": "junstyle.php-cs-fixer"
6+
},
7+
"php-cs-fixer.onsave": true,
8+
"markdown.extension.list.indentationSize": "adaptive",
9+
"markdown.extension.italic.indicator": "_",
10+
"markdown.extension.orderedList.marker": "one"
11+
}

CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
* Release files are included in install ([e87295d](https://github.com/iwf-web/php-coding-standard/commit/e87295da465512dcd08c6ff5583e44153aea1525))
99

10-
## [1.0.0](https://github.com/iwf-web/php-coding-standard/compare/0.1.0...1.0.0) (2025-12-19)
10+
## [1.0.0](https://github.com/iwf-web/php-coding-standard/compare/9522814...1.0.0) (2025-12-19)
1111

1212

1313
### ✨ Features

README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,8 @@ Key customizations over the base `@PhpCsFixer:risky` rule set:
9999

100100
Please read [CONTRIBUTING.md](CONTRIBUTING.md) for details on our code of conduct and the process for submitting pull requests.
101101

102+
This project uses [Conventional Commits](https://www.conventionalcommits.org/) for automated releases and changelog generation.
103+
102104
## Versioning
103105

104106
We use [SemVer](http://semver.org/) for versioning. For available versions, see the [tags on this repository][gh-tags].

composer.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,13 +45,16 @@
4545
"exclude": [
4646
".devcontainer",
4747
".github",
48+
".vscode",
4849
".editorconfig",
4950
".gitignore",
5051
".gitattributes",
5152
"CODEOWNERS",
5253
"*.md",
5354
"*.dist.php",
54-
"*release*.json"
55+
"*release*.json",
56+
"!README.md",
57+
"!CHANGELOG.md"
5558
]
5659
}
5760
}

0 commit comments

Comments
 (0)