Skip to content

Commit

Permalink
synchronize with branch 9.1
Browse files Browse the repository at this point in the history
  • Loading branch information
llaville committed Feb 5, 2024
2 parents 24e27e4 + bd45b98 commit b76725c
Show file tree
Hide file tree
Showing 6 changed files with 47 additions and 7 deletions.
11 changes: 11 additions & 0 deletions .changes/9.0.8.md
Original file line number Diff line number Diff line change
@@ -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)
9 changes: 9 additions & 0 deletions .changes/9.1.1.md
Original file line number Diff line number Diff line change
@@ -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)
24 changes: 22 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +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.7 - 2024-02-05
## 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.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

Expand Down Expand Up @@ -43,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
Expand Down
5 changes: 2 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
# syntax=docker/dockerfile:1.4
ARG PHP_VERSION=8.0
ARG PHPLINT_VERSION=9.0.7
ARG PHP_VERSION=8.3

FROM php:${PHP_VERSION}-cli-alpine

Expand All @@ -17,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 ${PHPLINT_VERSION}
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

Expand Down
3 changes: 2 additions & 1 deletion entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,11 @@
[ "$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)"
composer_global_home="/home/$(id -u -n)/.composer"
echo "> Path to Composer home dir: ${composer_global_home}"
fi

Expand Down
2 changes: 1 addition & 1 deletion src/Console/Application.php
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
final class Application extends BaseApplication
{
public const NAME = 'phplint';
public const VERSION = '9.0.7';
public const VERSION = '9.1.1';

public function __construct()
{
Expand Down

0 comments on commit b76725c

Please sign in to comment.