Skip to content

Commit

Permalink
Added PHP 8.3 between tested versions
Browse files Browse the repository at this point in the history
  • Loading branch information
tg666 committed Oct 11, 2024
1 parent c2d9296 commit f56c702
Show file tree
Hide file tree
Showing 5 changed files with 29 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
php-versions: ['7.4', '8.0', '8.1', '8.2']
php-versions: ['7.4', '8.0', '8.1', '8.2', '8.3']
steps:
- name: Checkout
uses: actions/checkout@v3
Expand Down
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
## [Unreleased]

## [1.3.1] - 2024-10-11
### Added
- Added PHP 8.3 between tested versions.

### Changed
- Moved `dimensions` field from the Position class to the `ImageContent` class according to changes in AMP v2.16.0 API changes.

Expand Down
16 changes: 15 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,21 @@ RUN apk add --no-cache ${PHPIZE_DEPS} \

CMD tail -f /dev/null

FROM php:8.2.13RC1-cli-alpine3.18 AS php82
FROM php:8.2.24-cli-alpine3.20 AS php82

CMD ["/bin/sh"]
WORKDIR /var/www/html

RUN apk add --no-cache --update git
RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
RUN apk add --no-cache ${PHPIZE_DEPS} \
&& pecl install pcov \
&& pecl install uopz-7.1.1 \
&& docker-php-ext-enable pcov uopz

CMD tail -f /dev/null

FROM php:8.3.12-cli-alpine3.20 AS php83

CMD ["/bin/sh"]
WORKDIR /var/www/html
Expand Down
1 change: 1 addition & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ tests.all:
PHP=80 make tests.run
PHP=81 make tests.run
PHP=82 make tests.run
PHP=83 make tests.run

cs.fix:
PHP=74 make composer.update
Expand Down
11 changes: 9 additions & 2 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: "3.7"

services:
php74:
build:
Expand Down Expand Up @@ -36,3 +34,12 @@ services:
container_name: 68publishers.amp-client-php.82
volumes:
- .:/var/www/html

php83:
build:
context: .
dockerfile: Dockerfile
target: php83
container_name: 68publishers.amp-client-php.83
volumes:
- .:/var/www/html

0 comments on commit f56c702

Please sign in to comment.