Skip to content

Commit 1bcf01e

Browse files
Merge pull request #179 from reload/dependabot/docker/v2/composer-8bbdf5c
2 parents 907ebf2 + c4d32e8 commit 1bcf01e

File tree

4 files changed

+287
-259
lines changed

4 files changed

+287
-259
lines changed

.github/workflows/pull_request.yml

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,26 @@ on: pull_request
22
name: Check and lint
33

44
jobs:
5+
php_version:
6+
name: Lookup PHP version
7+
runs-on: ubuntu-latest
8+
outputs:
9+
php_version: ${{ env.php_version }}
10+
steps:
11+
- uses: actions/checkout@v4
12+
- name: Lookup PHP version
13+
run: echo "php_versions=$(jq -r .config.platform.php)" >> "$GITHUB_ENV"
14+
515
review_codestyle:
616
name: Codestyle
717
runs-on: ubuntu-latest
18+
needs: php_version
819
steps:
920
- uses: actions/checkout@v4
1021
- name: Setup PHP, with composer and extensions
1122
uses: shivammathur/setup-php@master
1223
with:
13-
php-version: 8.2
24+
php-version: ${{ needs.php_version.outputs.php_version }}
1425
coverage: none
1526
- name: Install Dependencies
1627
run: composer install --no-interaction --no-progress
@@ -22,16 +33,17 @@ jobs:
2233
static_code_analysis:
2334
name: Static Code Analysis
2435
runs-on: ubuntu-latest
36+
needs: php_version
2537
steps:
2638
- uses: actions/checkout@v4
2739
- name: Setup PHP, with composer and extensions
2840
uses: shivammathur/setup-php@master
2941
with:
30-
php-version: 8.2
42+
php-version: ${{ needs.php_version.outputs.php_version }}
3143
coverage: none
3244
- name: Install Reviewdog
3345
run: |
34-
wget -O - -q https://raw.githubusercontent.com/reviewdog/reviewdog/master/install.sh| sh -s -- -b $PWD/ latest
46+
wget -O - -q https://raw.githubusercontent.com/reviewdog/reviewdog/master/install.sh| sh -s -- -b "$PWD/" latest
3547
- name: Install Dependencies
3648
run: |
3749
composer install --no-interaction --no-progress
@@ -44,12 +56,13 @@ jobs:
4456
unit_tests:
4557
name: PHPUnit tests
4658
runs-on: ubuntu-latest
59+
needs: php_version
4760
steps:
4861
- uses: actions/checkout@v4
4962
- name: Setup PHP, with composer and extensions
5063
uses: shivammathur/setup-php@master
5164
with:
52-
php-version: 8.2
65+
php-version: ${{ needs.php_version.outputs.php_version }}
5366
coverage: none
5467
- name: Install Dependencies
5568
run: |

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM composer:2.8.3@sha256:3e409c6df20d7d8b644f72467d54f203efd6b2695c6345d363abd1ca9a80c4c2 AS build-env
1+
FROM composer:2.8.3@sha256:8bbdf5ccb6c6ddd23c578cf0e80243b42addabc07f9d421f617a166e9afe84f5 AS build-env
22

33
ENV PHP_EXTENSIONS="bcmath intl xsl"
44

@@ -13,7 +13,7 @@ WORKDIR /opt/drupal-security-jira
1313

1414
RUN composer install --prefer-dist --no-dev
1515

16-
FROM php:8.3.7-alpine3.18@sha256:3da837b84db645187ae2f24ca664da3faee7c546f0e8d930950b12d24f0d8fa0
16+
FROM php:8.4.1-alpine3.20@sha256:38611113a7443402e0420649d3eb56bb7593a47d962bb42f8ebff62107c8d358
1717

1818
ADD https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions /usr/local/bin/
1919
# hadolint ignore=SC2086

composer.json

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@
66
"symfony/console": "^5.3",
77
"symfony/http-client": "^6.3",
88
"ext-openssl": "*",
9-
"veewee/xml": "^2.12",
9+
"veewee/xml": "^4",
1010
"reload/jira-security-issue": "^2",
1111
"composer/semver": "^3.3",
1212
"thecodingmachine/safe": "^2.5",
1313
"vlucas/phpdotenv": "^5.5",
14-
"azjezz/psl": "^2.8"
14+
"azjezz/psl": "^3.1"
1515
},
1616
"license": "MIT",
1717
"autoload": {
@@ -29,6 +29,9 @@
2929
"phpstan/phpstan-phpunit": "^1.3"
3030
},
3131
"config": {
32+
"platform": {
33+
"php": "8.4"
34+
},
3235
"allow-plugins": {
3336
"phpro/grumphp-shim": true,
3437
"phpstan/extension-installer": true

0 commit comments

Comments
 (0)