From 87fce46ab32076637779bb69d0bcde495c891d4a Mon Sep 17 00:00:00 2001 From: Laurent Laville Date: Mon, 5 Feb 2024 06:31:54 +0000 Subject: [PATCH 1/4] fix issue #200 --- .changes/unreleased/Fixed-20240205-063044.yaml | 4 ++++ entrypoint.sh | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) create mode 100644 .changes/unreleased/Fixed-20240205-063044.yaml diff --git a/.changes/unreleased/Fixed-20240205-063044.yaml b/.changes/unreleased/Fixed-20240205-063044.yaml new file mode 100644 index 00000000..193840c5 --- /dev/null +++ b/.changes/unreleased/Fixed-20240205-063044.yaml @@ -0,0 +1,4 @@ +kind: Fixed +body: '[#200](https://github.com/overtrue/phplint/issues/200) : Unable to create file + /github/home/.composer/config.json in Github Action' +time: 2024-02-05T06:30:44.244619077Z diff --git a/entrypoint.sh b/entrypoint.sh index b4e3c22d..8e20d93b 100755 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -6,8 +6,8 @@ set -e 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)" + composer_global_home="/home/$(id -u -n)/.composer" + echo "> Path to Composer home dir: ${composer_global_home}" fi -"$(composer config --global home)/vendor/bin/phplint" $@ +"${composer_global_home}/vendor/bin/phplint" $@ From a0407dc14176449693d8edeee51148c4805c241a Mon Sep 17 00:00:00 2001 From: Laurent Laville Date: Mon, 5 Feb 2024 06:39:17 +0000 Subject: [PATCH 2/4] fix issue #201 --- .changes/unreleased/Fixed-20240205-063850.yaml | 4 ++++ Dockerfile | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 .changes/unreleased/Fixed-20240205-063850.yaml diff --git a/.changes/unreleased/Fixed-20240205-063850.yaml b/.changes/unreleased/Fixed-20240205-063850.yaml new file mode 100644 index 00000000..89154a4b --- /dev/null +++ b/.changes/unreleased/Fixed-20240205-063850.yaml @@ -0,0 +1,4 @@ +kind: Fixed +body: '[#201](https://github.com/overtrue/phplint/issues/201) : GitHub Action build + docker on fly with wrong version' +time: 2024-02-05T06:38:50.002039814Z diff --git a/Dockerfile b/Dockerfile index 7d746abe..83f9deae 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,6 @@ # syntax=docker/dockerfile:1.4 ARG PHP_VERSION=8.2 +ARG PHPLINT_VERSION=9.0.7 FROM php:${PHP_VERSION}-cli-alpine @@ -16,7 +17,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.0 +RUN composer global require --no-progress overtrue/phplint ${PHPLINT_VERSION} # Following recommendation at https://docs.github.com/en/actions/creating-actions/dockerfile-support-for-github-actions#workdir From a0f1addcd056f601054e6f7fe3a495c28eb1c0ed Mon Sep 17 00:00:00 2001 From: Laurent Laville Date: Mon, 5 Feb 2024 08:46:14 +0000 Subject: [PATCH 3/4] bump new version (of branch 9.0) --- 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 5fe73826..13396716 100644 --- a/src/Console/Application.php +++ b/src/Console/Application.php @@ -33,7 +33,7 @@ final class Application extends BaseApplication { public const NAME = 'phplint'; - public const VERSION = '9.0.6'; + public const VERSION = '9.0.7'; public function __construct() { From 4eb6326ed46ee3488b992d09a1e3d691167fc45d Mon Sep 17 00:00:00 2001 From: Laurent Laville Date: Mon, 5 Feb 2024 08:52:42 +0000 Subject: [PATCH 4/4] prepare bugfix release 9.0.7 --- .changes/9.0.7.md | 9 +++++++++ .changes/unreleased/Fixed-20240205-063044.yaml | 4 ---- .changes/unreleased/Fixed-20240205-063850.yaml | 4 ---- CHANGELOG.md | 9 +++++++++ 4 files changed, 18 insertions(+), 8 deletions(-) create mode 100644 .changes/9.0.7.md delete mode 100644 .changes/unreleased/Fixed-20240205-063044.yaml delete mode 100644 .changes/unreleased/Fixed-20240205-063850.yaml 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/unreleased/Fixed-20240205-063044.yaml b/.changes/unreleased/Fixed-20240205-063044.yaml deleted file mode 100644 index 193840c5..00000000 --- a/.changes/unreleased/Fixed-20240205-063044.yaml +++ /dev/null @@ -1,4 +0,0 @@ -kind: Fixed -body: '[#200](https://github.com/overtrue/phplint/issues/200) : Unable to create file - /github/home/.composer/config.json in Github Action' -time: 2024-02-05T06:30:44.244619077Z diff --git a/.changes/unreleased/Fixed-20240205-063850.yaml b/.changes/unreleased/Fixed-20240205-063850.yaml deleted file mode 100644 index 89154a4b..00000000 --- a/.changes/unreleased/Fixed-20240205-063850.yaml +++ /dev/null @@ -1,4 +0,0 @@ -kind: Fixed -body: '[#201](https://github.com/overtrue/phplint/issues/201) : GitHub Action build - docker on fly with wrong version' -time: 2024-02-05T06:38:50.002039814Z diff --git a/CHANGELOG.md b/CHANGELOG.md index f900fed4..62cfe84f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,15 @@ 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.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