Skip to content

Commit 7c76890

Browse files
committed
Merge remote-tracking branch 'upstream/develop' into 4.4
2 parents 8708ee8 + 56bc931 commit 7c76890

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

.github/workflows/reusable-phpunit-test.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -144,8 +144,8 @@ jobs:
144144
if: ${{ contains(inputs.extra-extensions, 'imagick') }}
145145
run: |
146146
sudo apt-get update
147-
sudo apt-get install --reinstall libgs9-common fonts-noto-mono libgs9:amd64 libijs-0.35:amd64 fonts-urw-base35 ghostscript poppler-data libjbig2dec0:amd64 gsfonts libopenjp2-7:amd64 fonts-droid-fallback fonts-dejavu-core
148-
sudo apt-get install -y imagemagick
147+
sudo apt-get install --reinstall libgs9-common fonts-noto-mono libgs9:amd64 libijs-0.35:amd64 fonts-urw-base35 ghostscript poppler-data libjbig2dec0:amd64 libopenjp2-7:amd64 fonts-droid-fallback fonts-dejavu-core
148+
sudo apt-get install -y gsfonts libmagickwand-dev imagemagick
149149
sudo apt-get install --fix-broken
150150
151151
- name: Checkout

.github/workflows/test-phpunit.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ on:
1313
- composer.json
1414
- phpunit.xml.dist
1515
- .github/workflows/test-phpunit.yml
16+
- .github/workflows/reusable-phpunit-test.yml
1617

1718
pull_request:
1819
branches:
@@ -26,6 +27,7 @@ on:
2627
- composer.json
2728
- phpunit.xml.dist
2829
- .github/workflows/test-phpunit.yml
30+
- .github/workflows/reusable-phpunit-test.yml
2931

3032
concurrency:
3133
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}

0 commit comments

Comments
 (0)