Skip to content

Commit

Permalink
merge branch 9.0 (for upcoming release 9.0.7)
Browse files Browse the repository at this point in the history
  • Loading branch information
llaville committed Feb 5, 2024
2 parents d510b14 + 4eb6326 commit 24e27e4
Show file tree
Hide file tree
Showing 5 changed files with 25 additions and 6 deletions.
9 changes: 9 additions & 0 deletions .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)
9 changes: 9 additions & 0 deletions CHANGELOG.md
Expand Up @@ -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.1.0 - 2023-12-17

### Added
Expand Down
5 changes: 3 additions & 2 deletions Dockerfile
@@ -1,5 +1,6 @@
# syntax=docker/dockerfile:1.4
ARG PHP_VERSION=8.3
ARG PHP_VERSION=8.0
ARG PHPLINT_VERSION=9.0.7

FROM php:${PHP_VERSION}-cli-alpine

Expand All @@ -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.1
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

Expand Down
6 changes: 3 additions & 3 deletions entrypoint.sh
Expand Up @@ -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" $@
2 changes: 1 addition & 1 deletion src/Console/Application.php
Expand Up @@ -36,7 +36,7 @@
final class Application extends BaseApplication
{
public const NAME = 'phplint';
public const VERSION = '9.1.0';
public const VERSION = '9.0.7';

public function __construct()
{
Expand Down

0 comments on commit 24e27e4

Please sign in to comment.