From 271497168e409c1d7b88f37a045b8f6992c53d0a Mon Sep 17 00:00:00 2001 From: Laurent Laville Date: Mon, 5 Feb 2024 09:53:22 +0000 Subject: [PATCH 1/5] synchronize ChangeLog with latest version 9.0.x --- CHANGELOG.md | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 262d599a..d1e04cc2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,26 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html), and is generated by [Changie](https://github.com/miniscruff/changie). +## 9.0.8 - 2024-02-05 + +**IMPORTANT** Do not use version 9.0.7 (wrong fixes for Docker targets, including GitHub Actions) + +### Fixed + +- [#200](https://github.com/overtrue/phplint/issues/200) : Unable to create file `/github/home/.composer/config.json` in GitHub Action +- [#201](https://github.com/overtrue/phplint/issues/201) : GitHub Action build docker on fly with wrong version + +**Full Changelog**: [9.0.6...9.0.8](https://github.com/overtrue/phplint/compare/9.0.6...9.0.7) + +## 9.0.7 - 2024-02-05 + +### Fixed + +- [#200](https://github.com/overtrue/phplint/issues/200) : Unable to create file `/github/home/.composer/config.json` in GitHub Action +- [#201](https://github.com/overtrue/phplint/issues/201) : GitHub Action build docker on fly with wrong version + +**Full Changelog**: [9.0.6...9.0.7](https://github.com/overtrue/phplint/compare/9.0.6...9.0.7) + ## 9.1.0 - 2023-12-17 ### Added From 0d89732d6b375a895ac69c38073ac2fac21a6040 Mon Sep 17 00:00:00 2001 From: Laurent Laville Date: Mon, 5 Feb 2024 09:54:09 +0000 Subject: [PATCH 2/5] bump new version (same issue fixes as 9.0.8) --- src/Console/Application.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Console/Application.php b/src/Console/Application.php index 88c09c17..cb87ca1c 100644 --- a/src/Console/Application.php +++ b/src/Console/Application.php @@ -36,7 +36,7 @@ final class Application extends BaseApplication { public const NAME = 'phplint'; - public const VERSION = '9.1.0'; + public const VERSION = '9.1.1'; public function __construct() { From d3563169051057f6f44c7baecc6458b598ae7aba Mon Sep 17 00:00:00 2001 From: Laurent Laville Date: Mon, 5 Feb 2024 09:58:56 +0000 Subject: [PATCH 3/5] related to issue #201 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index fd0aeea3..47af37e3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -16,7 +16,7 @@ USER appuser # Install Composer v2 then overtrue/phplint package COPY --from=composer/composer:2-bin /composer /usr/bin/composer ENV COMPOSER_ALLOW_SUPERUSER 1 -RUN composer global require --no-progress overtrue/phplint ^9.1 +RUN composer global require --no-progress overtrue/phplint 9.1.x-dev # Following recommendation at https://docs.github.com/en/actions/creating-actions/dockerfile-support-for-github-actions#workdir From 340ccbcfb06cd98977f417d1e38669425e963330 Mon Sep 17 00:00:00 2001 From: Laurent Laville Date: Mon, 5 Feb 2024 09:59:20 +0000 Subject: [PATCH 4/5] related to issue #200 --- entrypoint.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/entrypoint.sh b/entrypoint.sh index b4e3c22d..9e10dbcb 100755 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -3,11 +3,12 @@ [ "$APP_DEBUG" == 'true' ] && set -x set -e +composer_global_home="/home/$(id -u -n)/.composer" + if [ "$APP_DEBUG" == 'true' ] then echo "> You will act as user: $(id -u -n)" - echo "$(composer config --global --list)" - /bin/sh -c "ls -l $(composer config --global home)" + echo "> Path to Composer home dir: ${composer_global_home}" fi -"$(composer config --global home)/vendor/bin/phplint" $@ +"${composer_global_home}/vendor/bin/phplint" $@ From bd45b9893cead7233d76cca1c5ccde28757deedc Mon Sep 17 00:00:00 2001 From: Laurent Laville Date: Mon, 5 Feb 2024 10:03:50 +0000 Subject: [PATCH 5/5] prepare bugfix releas 9.1.1 (same as for branch 9.0 - 9.0.8) --- .changes/9.0.7.md | 9 +++++++++ .changes/9.0.8.md | 11 +++++++++++ .changes/9.1.1.md | 9 +++++++++ CHANGELOG.md | 35 ++++++++++++++++++++++------------- 4 files changed, 51 insertions(+), 13 deletions(-) create mode 100644 .changes/9.0.7.md create mode 100644 .changes/9.0.8.md create mode 100644 .changes/9.1.1.md diff --git a/.changes/9.0.7.md b/.changes/9.0.7.md new file mode 100644 index 00000000..d8653f87 --- /dev/null +++ b/.changes/9.0.7.md @@ -0,0 +1,9 @@ + +## 9.0.7 - 2024-02-05 + +### Fixed + +- [#200](https://github.com/overtrue/phplint/issues/200) : Unable to create file `/github/home/.composer/config.json` in GitHub Action +- [#201](https://github.com/overtrue/phplint/issues/201) : GitHub Action build docker on fly with wrong version + +**Full Changelog**: [9.0.6...9.0.7](https://github.com/overtrue/phplint/compare/9.0.6...9.0.7) diff --git a/.changes/9.0.8.md b/.changes/9.0.8.md new file mode 100644 index 00000000..5da7628e --- /dev/null +++ b/.changes/9.0.8.md @@ -0,0 +1,11 @@ + +## 9.0.8 - 2024-02-05 + +**IMPORTANT** Do not use version 9.0.7 (wrong fixes for Docker targets, including GitHub Actions) + +### Fixed + +- [#200](https://github.com/overtrue/phplint/issues/200) : Unable to create file `/github/home/.composer/config.json` in GitHub Action +- [#201](https://github.com/overtrue/phplint/issues/201) : GitHub Action build docker on fly with wrong version + +**Full Changelog**: [9.0.6...9.0.8](https://github.com/overtrue/phplint/compare/9.0.6...9.0.7) diff --git a/.changes/9.1.1.md b/.changes/9.1.1.md new file mode 100644 index 00000000..21a56b5f --- /dev/null +++ b/.changes/9.1.1.md @@ -0,0 +1,9 @@ + +## 9.1.1 - 2024-02-05 + +### Fixed + +- [#200](https://github.com/overtrue/phplint/issues/200) : Unable to create file `/github/home/.composer/config.json` in GitHub Action +- [#201](https://github.com/overtrue/phplint/issues/201) : GitHub Action build docker on fly with wrong version + +**Full Changelog**: [9.1.0...9.1.1](https://github.com/overtrue/phplint/compare/9.0.6...9.0.7) diff --git a/CHANGELOG.md b/CHANGELOG.md index d1e04cc2..098e81df 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,25 +7,14 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html), and is generated by [Changie](https://github.com/miniscruff/changie). -## 9.0.8 - 2024-02-05 - -**IMPORTANT** Do not use version 9.0.7 (wrong fixes for Docker targets, including GitHub Actions) +## 9.1.1 - 2024-02-05 ### Fixed - [#200](https://github.com/overtrue/phplint/issues/200) : Unable to create file `/github/home/.composer/config.json` in GitHub Action - [#201](https://github.com/overtrue/phplint/issues/201) : GitHub Action build docker on fly with wrong version -**Full Changelog**: [9.0.6...9.0.8](https://github.com/overtrue/phplint/compare/9.0.6...9.0.7) - -## 9.0.7 - 2024-02-05 - -### Fixed - -- [#200](https://github.com/overtrue/phplint/issues/200) : Unable to create file `/github/home/.composer/config.json` in GitHub Action -- [#201](https://github.com/overtrue/phplint/issues/201) : GitHub Action build docker on fly with wrong version - -**Full Changelog**: [9.0.6...9.0.7](https://github.com/overtrue/phplint/compare/9.0.6...9.0.7) +**Full Changelog**: [9.1.0...9.1.1](https://github.com/overtrue/phplint/compare/9.0.6...9.0.7) ## 9.1.0 - 2023-12-17 @@ -54,6 +43,26 @@ as there are no more required **Full Changelog**: [9.0.6...9.1.0](https://github.com/overtrue/phplint/compare/9.0.6...9.1.0) +## 9.0.8 - 2024-02-05 + +**IMPORTANT** Do not use version 9.0.7 (wrong fixes for Docker targets, including GitHub Actions) + +### Fixed + +- [#200](https://github.com/overtrue/phplint/issues/200) : Unable to create file `/github/home/.composer/config.json` in GitHub Action +- [#201](https://github.com/overtrue/phplint/issues/201) : GitHub Action build docker on fly with wrong version + +**Full Changelog**: [9.0.6...9.0.8](https://github.com/overtrue/phplint/compare/9.0.6...9.0.7) + +## 9.0.7 - 2024-02-05 + +### Fixed + +- [#200](https://github.com/overtrue/phplint/issues/200) : Unable to create file `/github/home/.composer/config.json` in GitHub Action +- [#201](https://github.com/overtrue/phplint/issues/201) : GitHub Action build docker on fly with wrong version + +**Full Changelog**: [9.0.6...9.0.7](https://github.com/overtrue/phplint/compare/9.0.6...9.0.7) + ## 9.0.6 - 2023-12-02 ### Fixed