Skip to content

Commit 0441771

Browse files
committed
fix: tests pipeline
1 parent 3ed9af8 commit 0441771

File tree

3 files changed

+80
-76
lines changed

3 files changed

+80
-76
lines changed

.github/workflows/build.yaml

+7-7
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
uses: shivammathur/setup-php@v2
1515
- name: Validate composer.json
1616
run: |
17-
(cd src/Bundle && composer validate --strict --no-check-lock)
17+
(cd src/Framework/Symfony && composer validate --strict --no-check-lock)
1818
tests:
1919
runs-on: ubuntu-20.04
2020
strategy:
@@ -50,16 +50,16 @@ jobs:
5050
with:
5151
php-version: ${{ matrix.php }}
5252
- run: |
53-
sed -ri 's/"symfony\/(.+)": "(.+)"/"symfony\/\1": "'${{ matrix.symfony }}'"/' src/Bundle/composer.json;
53+
sed -ri 's/"symfony\/(.+)": "(.+)"/"symfony\/\1": "'${{ matrix.symfony }}'"/' src/Framework/Symfony/composer.json;
5454
if: matrix.symfony
5555
- run: |
5656
composer config minimum-stability dev
5757
composer config prefer-stable true
5858
if: matrix.beta
5959
- run: |
60-
(cd src/Bundle && composer update --prefer-dist --no-interaction --no-progress --ansi ${{ matrix.composer_option }})
60+
(cd src/Framework/Symfony && composer update --prefer-dist --no-interaction --no-progress --ansi ${{ matrix.composer_option }})
6161
- run: |
62-
(cd src/Bundle && vendor/bin/phpunit)
62+
(cd src/Framework/Symfony && vendor/bin/phpunit)
6363
tests-windows:
6464
runs-on: windows-2022
6565
strategy:
@@ -95,13 +95,13 @@ jobs:
9595
with:
9696
php-version: ${{ matrix.php }}
9797
- run: |
98-
(Get-Content composer.json) -replace '("symfony/[^"]+": )"[^"]+"', '$1"${{ matrix.symfony }}"' | Out-File -encoding ASCII src/Bundle/composer.json
98+
(Get-Content composer.json) -replace '("symfony/[^"]+": )"[^"]+"', '$1"${{ matrix.symfony }}"' | Out-File -encoding ASCII src/Framework/Symfony/composer.json
9999
if: matrix.symfony
100100
- run: |
101101
composer config minimum-stability dev
102102
composer config prefer-stable true
103103
if: matrix.beta
104104
- run: |
105-
{cd src/Bundle && composer update --prefer-dist --no-interaction --no-progress --ansi ${{ matrix.composer_option }}}
105+
{cd src/Framework/Symfony && composer update --prefer-dist --no-interaction --no-progress --ansi ${{ matrix.composer_option }}}
106106
- run: |
107-
{cd src/Bundle && vendor/bin/phpunit}
107+
{cd src/Framework/Symfony && vendor/bin/phpunit}

.github/workflows/tests.yaml

+4-5
Original file line numberDiff line numberDiff line change
@@ -46,17 +46,16 @@ jobs:
4646
- knplabs/snappy
4747
path:
4848
- ./
49-
# include: ${{ fromJson(needs.packages.outputs.packages) }}
49+
include: ${{ fromJson(needs.packages.outputs.packages) }}
5050
defaults:
5151
run:
5252
working-directory: ${{ matrix.path }}
5353
steps:
5454
- uses: actions/checkout@v4
55-
with:
56-
sparse-checkout: |
57-
src/Core/
58-
${{ matrix.path }}
5955
- uses: shivammathur/setup-php@v2
56+
- name: composer patch
57+
run: |
58+
cat <<< $(jq '.+{repositories: [{type: "path", url: "${{ github.workspace }}/src/Core", options: { versions: { "knplabs/snappy-core": "self.version" } }}]}' < composer.json) > composer.json
6059
- name: composer install
6160
run: |
6261
composer install

composer.json

+69-64
Original file line numberDiff line numberDiff line change
@@ -1,69 +1,74 @@
11
{
2-
"name": "knplabs/knp-snappy",
3-
"description": "PHP library allowing thumbnail, snapshot or PDF generation from a url or a html page. Wrapper for wkhtmltopdf/wkhtmltoimage.",
4-
"license": "MIT",
5-
"type": "library",
6-
"keywords": [
7-
"pdf",
8-
"thumbnail",
9-
"snapshot",
10-
"knplabs",
11-
"knp",
12-
"wkhtmltopdf"
13-
],
14-
"authors": [
15-
{
16-
"name": "KNP Labs Team",
17-
"homepage": "http://knplabs.com"
18-
},
19-
{
20-
"name": "Symfony Community",
21-
"homepage": "http://github.com/KnpLabs/snappy/contributors"
22-
}
23-
],
24-
"homepage": "http://github.com/KnpLabs/snappy",
25-
"require": {
26-
"php": ">=8.1",
27-
"dompdf/dompdf": "^3.0",
28-
"psr/http-factory": "^1.1",
29-
"psr/http-message": "^2.0",
30-
"psr/log": "^2.0|^3.0",
31-
"symfony/config": "^5.4|^6.4|^7.1",
32-
"symfony/dependency-injection": "^5.4|^6.4|^7.1",
33-
"symfony/http-client": "^5.4|^6.4|^7.1",
34-
"symfony/http-kernel": "^5.4|^6.4|^7.1",
35-
"symfony/process": "^5.4|^6.4|^7.1"
2+
"name": "knplabs/knp-snappy",
3+
"description": "PHP library allowing thumbnail, snapshot or PDF generation from a url or a html page. Wrapper for wkhtmltopdf/wkhtmltoimage.",
4+
"license": "MIT",
5+
"type": "library",
6+
"keywords": [
7+
"pdf",
8+
"thumbnail",
9+
"snapshot",
10+
"knplabs",
11+
"knp",
12+
"wkhtmltopdf"
13+
],
14+
"authors": [
15+
{
16+
"name": "KNP Labs Team",
17+
"homepage": "http://knplabs.com"
3618
},
37-
"require-dev": {
38-
"nyholm/psr7": "^1.8",
39-
"phpstan/extension-installer": "^1.4",
40-
"phpstan/phpstan": "^1.12",
41-
"phpstan/phpstan-phpunit": "^1.4",
42-
"phpunit/phpunit": "^11.4"
43-
},
44-
"replace": {
45-
"knplabs/snappy-bundle": "self.version",
46-
"knplabs/snappy-core": "self.version",
47-
"knplabs/snappy-dompdf": "self.version",
48-
"knplabs/snappy-wkhtmltopdf": "self.version"
49-
},
50-
"autoload": {
51-
"psr-4": {
52-
"KNPLabs\\Snappy\\Backend\\Dompdf\\": "src/Backend/Dompdf/",
53-
"KNPLabs\\Snappy\\Backend\\WkHtmlToPdf\\": "src/Backend/WkHtmlToPdf/",
54-
"KNPLabs\\Snappy\\Core\\": "src/Core/",
55-
"KNPLabs\\Snappy\\Framework\\Symfony\\": "src/Framework/Symfony/"
56-
}
57-
},
58-
"config": {
59-
"allow-plugins": {
60-
"phpstan/extension-installer": true
61-
},
62-
"sort-packages": true
19+
{
20+
"name": "Symfony Community",
21+
"homepage": "http://github.com/KnpLabs/snappy/contributors"
22+
}
23+
],
24+
"homepage": "http://github.com/KnpLabs/snappy",
25+
"require": {
26+
"php": ">=8.1",
27+
"dompdf/dompdf": "^3.0",
28+
"psr/http-factory": "^1.1",
29+
"psr/http-message": "^2.0",
30+
"psr/log": "^2.0|^3.0",
31+
"symfony/config": "^5.4|^6.4|^7.1",
32+
"symfony/dependency-injection": "^5.4|^6.4|^7.1",
33+
"symfony/http-client": "^5.4|^6.4|^7.1",
34+
"symfony/http-kernel": "^5.4|^6.4|^7.1",
35+
"symfony/process": "^5.4|^6.4|^7.1"
36+
},
37+
"require-dev": {
38+
"nyholm/psr7": "^1.8",
39+
"phpstan/extension-installer": "^1.4",
40+
"phpstan/phpstan": "^1.12",
41+
"phpstan/phpstan-phpunit": "^1.4",
42+
"phpunit/phpunit": "^11.4"
43+
},
44+
"replace": {
45+
"knplabs/snappy-bundle": "self.version",
46+
"knplabs/snappy-core": "self.version",
47+
"knplabs/snappy-dompdf": "self.version",
48+
"knplabs/snappy-wkhtmltopdf": "self.version"
49+
},
50+
"autoload": {
51+
"psr-4": {
52+
"KNPLabs\\Snappy\\Backend\\Dompdf\\": "src/Backend/Dompdf/",
53+
"KNPLabs\\Snappy\\Backend\\WkHtmlToPdf\\": "src/Backend/WkHtmlToPdf/",
54+
"KNPLabs\\Snappy\\Core\\": "src/Core/",
55+
"KNPLabs\\Snappy\\Framework\\Symfony\\": "src/Framework/Symfony/"
56+
}
57+
},
58+
"config": {
59+
"allow-plugins": {
60+
"phpstan/extension-installer": true
6361
},
64-
"extra": {
65-
"branch-alias": {
66-
"dev-master": "2.x-dev"
67-
}
62+
"sort-packages": true
63+
},
64+
"extra": {
65+
"branch-alias": {
66+
"dev-master": "2.x-dev"
67+
}
68+
},
69+
"repositories": [
70+
{
71+
"url": "src/Core"
6872
}
73+
]
6974
}

0 commit comments

Comments
 (0)