From a0ac227522729b460cbe526a59706ad6ce160681 Mon Sep 17 00:00:00 2001 From: D3strukt0r Date: Mon, 22 Dec 2025 08:10:42 +0100 Subject: [PATCH 1/6] fix: Bot user is unbanned, use it's token again --- .github/workflows/release.yml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 3844771..2ad234b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -16,8 +16,7 @@ jobs: steps: - name: Create Release PR uses: googleapis/release-please-action@v4 - #with: - # # Bot PAT with access to Workflows - # # The built-in GITHUB_TOKEN has cannot trigger other workflows - # # Use custom token once banned iwf-web-bot is resolved - # token: ${{ secrets.GH_PAT }} + with: + # Bot PAT with access to Workflows + # The built-in GITHUB_TOKEN has cannot trigger other workflows + token: ${{ secrets.GH_PAT }} From 49e872264f0f09640e79c20e4d35259d473a98ca Mon Sep 17 00:00:00 2001 From: D3strukt0r Date: Mon, 22 Dec 2025 12:08:03 +0100 Subject: [PATCH 2/6] chore: Add note about conventional commits --- .github/workflows/release.yml | 2 +- README.md | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 2ad234b..387f35f 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -18,5 +18,5 @@ jobs: uses: googleapis/release-please-action@v4 with: # Bot PAT with access to Workflows - # The built-in GITHUB_TOKEN has cannot trigger other workflows + # The built-in GITHUB_TOKEN has cannot trigger other workflows token: ${{ secrets.GH_PAT }} diff --git a/README.md b/README.md index 6c3ec2a..6ef2c52 100644 --- a/README.md +++ b/README.md @@ -99,6 +99,8 @@ Key customizations over the base `@PhpCsFixer:risky` rule set: Please read [CONTRIBUTING.md](CONTRIBUTING.md) for details on our code of conduct and the process for submitting pull requests. +This project uses [Conventional Commits](https://www.conventionalcommits.org/) for automated releases and changelog generation. + ## Versioning We use [SemVer](http://semver.org/) for versioning. For available versions, see the [tags on this repository][gh-tags]. From a28f33b044b367f62a507cfbb89f954ac8ceea48 Mon Sep 17 00:00:00 2001 From: D3strukt0r Date: Mon, 22 Dec 2025 13:32:53 +0100 Subject: [PATCH 3/6] chore(deps): Update actions/cache --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d37fe2f..cbaa98f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -27,7 +27,7 @@ jobs: id: composer-cache run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT - name: Cache Composer dependencies - uses: actions/cache@v4 + uses: actions/cache@v5 with: path: ${{ steps.composer-cache.outputs.dir }} key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }} From e98c28f44a951bcd6baab836f61c63061f179dcb Mon Sep 17 00:00:00 2001 From: D3strukt0r Date: Mon, 22 Dec 2025 17:58:20 +0100 Subject: [PATCH 4/6] fix: Keep readme in package --- .devcontainer/devcontainer.json | 11 +---------- .editorconfig | 2 +- .gitattributes | 3 +++ .vscode/settings.json | 11 +++++++++++ composer.json | 5 ++++- 5 files changed, 20 insertions(+), 12 deletions(-) create mode 100644 .vscode/settings.json diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 14d37fa..b59426a 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -55,17 +55,8 @@ "yzhang.markdown-all-in-one" ], "settings": { - "editor.formatOnSave": true, - "[php]": { - "editor.tabSize": 4, - "editor.defaultFormatter": "junstyle.php-cs-fixer" - }, "php-cs-fixer.executablePath": "${workspaceFolder}/vendor/bin/php-cs-fixer", - "php-cs-fixer.config": "${workspaceFolder}/.php-cs-fixer.dist.php", - "php-cs-fixer.onsave": true, - "markdown.extension.list.indentationSize": "adaptive", - "markdown.extension.italic.indicator": "_", - "markdown.extension.orderedList.marker": "one" + "php-cs-fixer.config": "${workspaceFolder}/.php-cs-fixer.dist.php" } } } diff --git a/.editorconfig b/.editorconfig index 43c933e..4bcd596 100644 --- a/.editorconfig +++ b/.editorconfig @@ -48,7 +48,7 @@ indent_size = 4 tab_width = 4 ij_continuation_indent_size = 4 -[{composer.json,.phpunit.result.cache,composer.lock}] +[{.vscode/settings.json,composer.json,.phpunit.result.cache,composer.lock}] indent_size = 4 tab_width = 4 ij_continuation_indent_size = 4 diff --git a/.gitattributes b/.gitattributes index afd2aaa..8a67309 100644 --- a/.gitattributes +++ b/.gitattributes @@ -4,6 +4,7 @@ # This is what is relevant for composer installs .devcontainer export-ignore .github export-ignore +.vscode export-ignore .editorconfig export-ignore .gitignore export-ignore .gitattributes export-ignore @@ -11,3 +12,5 @@ CODEOWNERS export-ignore *.md export-ignore *.dist.php export-ignore *release*.json export-ignore +README.md -export-ignore export-subst +CHANGELOG.md -export-ignore export-subst diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..68d302a --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,11 @@ +{ + "editor.formatOnSave": true, + "[php]": { + "editor.tabSize": 4, + "editor.defaultFormatter": "junstyle.php-cs-fixer" + }, + "php-cs-fixer.onsave": true, + "markdown.extension.list.indentationSize": "adaptive", + "markdown.extension.italic.indicator": "_", + "markdown.extension.orderedList.marker": "one" +} diff --git a/composer.json b/composer.json index 16aa386..f43442e 100644 --- a/composer.json +++ b/composer.json @@ -45,13 +45,16 @@ "exclude": [ ".devcontainer", ".github", + ".vscode", ".editorconfig", ".gitignore", ".gitattributes", "CODEOWNERS", "*.md", "*.dist.php", - "*release*.json" + "*release*.json", + "!README.md", + "!CHANGELOG.md" ] } } From bffd2d17c7b807b82a7478f55f546ccda3a2dc29 Mon Sep 17 00:00:00 2001 From: D3strukt0r Date: Mon, 22 Dec 2025 18:06:10 +0100 Subject: [PATCH 5/6] fix: dependabot wrong target branch --- .github/dependabot.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index fdbd12b..5d9d68a 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -9,6 +9,7 @@ version: 2 updates: - package-ecosystem: github-actions directory: / + target-branch: develop labels: - "dependabot :robot:" schedule: @@ -18,6 +19,7 @@ updates: - package-ecosystem: devcontainers directory: / + target-branch: develop labels: - "dependabot :robot:" schedule: @@ -27,6 +29,7 @@ updates: - package-ecosystem: composer directory: / + target-branch: develop labels: - "dependabot :robot:" schedule: From 59ebb3addb60f95878594175c88dc696bce47508 Mon Sep 17 00:00:00 2001 From: D3strukt0r Date: Mon, 22 Dec 2025 18:12:23 +0100 Subject: [PATCH 6/6] chore: Changelog goes to wrong comparison --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7987119..473a38f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,7 +7,7 @@ * Release files are included in install ([e87295d](https://github.com/iwf-web/php-coding-standard/commit/e87295da465512dcd08c6ff5583e44153aea1525)) -## [1.0.0](https://github.com/iwf-web/php-coding-standard/compare/0.1.0...1.0.0) (2025-12-19) +## [1.0.0](https://github.com/iwf-web/php-coding-standard/compare/9522814...1.0.0) (2025-12-19) ### ✨ Features