Skip to content

Commit 5d39660

Browse files
authored
Merge pull request #123 from phug-php/fix/multi-tester-job
Fix multi-tester job
2 parents 13a1e5c + 4d7bae3 commit 5d39660

6 files changed

Lines changed: 30 additions & 29 deletions

File tree

.github/workflows/coverage.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
name: PHP
2020

2121
steps:
22-
- uses: actions/checkout@v4
22+
- uses: actions/checkout@v6
2323

2424
- name: Setup PHP
2525
uses: shivammathur/setup-php@v2
@@ -32,7 +32,7 @@ jobs:
3232

3333
- name: Cache Composer packages
3434
id: composer-cache
35-
uses: actions/cache@v4
35+
uses: actions/cache@v5
3636
with:
3737
path: vendor
3838
key: ${{ runner.os }}-${{ matrix.setup }}-coverage-${{ matrix.php }}-${{ hashFiles('**/composer.lock') }}

.github/workflows/multi-tester.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
name: PHP ${{ matrix.php }}
1919

2020
steps:
21-
- uses: actions/checkout@v4
21+
- uses: actions/checkout@v6
2222

2323
- name: Setup PHP
2424
uses: shivammathur/setup-php@v2
@@ -28,7 +28,7 @@ jobs:
2828

2929
- name: Cache Composer packages
3030
id: composer-cache
31-
uses: actions/cache@v4
31+
uses: actions/cache@v5
3232
with:
3333
path: vendor
3434
key: ${{ runner.os }}-multi-test-v2-${{ matrix.php }}-${{ hashFiles('**/composer.lock') }}
@@ -38,6 +38,7 @@ jobs:
3838
- name: Install dependencies
3939
if: steps.composer-cache.outputs.cache-hit != 'true'
4040
run: |
41+
composer remove cebe/markdown js-phpize/js-phpize-phug nodejs-php-fallback/coffeescript nodejs-php-fallback/less nodejs-php-fallback/stylus nodejs-php-fallback/uglify phpunit/phpunit phpunit/php-code-coverage phpunit/php-invoker pug-php/pug pug-php/pug-filter-coffee-script squizlabs/php_codesniffer --dev --no-update --no-interaction
4142
composer require kylekatarnls/multi-tester:^2.6.0 --dev --no-update --no-interaction
4243
composer update --prefer-dist --prefer-${{ matrix.setup }} --no-progress --no-interaction
4344

.github/workflows/split.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
runs-on: ubuntu-latest
1212

1313
steps:
14-
- uses: actions/checkout@v4
14+
- uses: actions/checkout@v6
1515

1616
- name: Setup PHP
1717
uses: shivammathur/setup-php@v2
@@ -21,7 +21,7 @@ jobs:
2121

2222
# - name: Cache Composer packages
2323
# id: composer-cache
24-
# uses: actions/cache@v4
24+
# uses: actions/cache@v5
2525
# with:
2626
# path: vendor
2727
# key: split-${{ hashFiles('**/composer.lock') }}
@@ -32,7 +32,7 @@ jobs:
3232
if: steps.composer-cache.outputs.cache-hit != 'true'
3333
run: |
3434
test -f composer.json && mv composer.json composer.json.save -f
35-
composer require "phug/split:dev-feature/packagist-v2" --no-interaction
35+
composer require "phug/split:^1.5.1" --no-interaction
3636
test -f composer.json.save && mv composer.json.save composer.json -f
3737
3838
- name: Split monorepository

.github/workflows/style.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
name: PHP ${{ matrix.php }} - ${{ matrix.setup }}
2020

2121
steps:
22-
- uses: actions/checkout@v4
22+
- uses: actions/checkout@v6
2323

2424
- name: Setup PHP
2525
uses: shivammathur/setup-php@v2
@@ -29,7 +29,7 @@ jobs:
2929

3030
- name: Cache Composer packages
3131
id: composer-cache
32-
uses: actions/cache@v4
32+
uses: actions/cache@v5
3333
with:
3434
path: vendor
3535
key: style-${{ runner.os }}-${{ matrix.setup }}-${{ matrix.php }}-${{ hashFiles('**/composer.lock') }}

.github/workflows/tests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
name: PHP ${{ matrix.php }} - ${{ matrix.setup }}
2020

2121
steps:
22-
- uses: actions/checkout@v4
22+
- uses: actions/checkout@v6
2323

2424
- name: Setup PHP
2525
uses: shivammathur/setup-php@v2
@@ -30,7 +30,7 @@ jobs:
3030

3131
- name: Cache Composer packages
3232
id: composer-cache
33-
uses: actions/cache@v4
33+
uses: actions/cache@v5
3434
with:
3535
path: vendor
3636
key: php-${{ matrix.php }}-${{ runner.os }}-${{ matrix.setup }}-${{ hashFiles('**/composer.lock') }}

.multi-tester.yml

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@ pug-php/pug:
66
install: github
77
script: github
88

9-
pug/bemto:
10-
autoload:
11-
- cp -r vendor/phug/phug vendor/phug/compiler
12-
- cp -r vendor/phug/phug vendor/phug/formatter
13-
- composer self-update 1.10.17
14-
- composer dump-autoload --optimize --no-interaction --quiet
15-
- composer self-update --2
9+
#pug/bemto:
10+
# autoload:
11+
# - cp -r vendor/phug/phug vendor/phug/compiler
12+
# - cp -r vendor/phug/phug vendor/phug/formatter
13+
# - composer self-update 1.10.17
14+
# - composer dump-autoload --optimize --no-interaction --quiet
15+
# - composer self-update --2
1616

1717
pug-php/pug-assets:
1818
install:
@@ -24,17 +24,17 @@ pug-php/pug-minify:
2424
- composer config --no-plugins allow-plugins.nodejs-php-fallback/nodejs-php-fallback true
2525
- composer install --no-interaction
2626

27-
pug/slim:
28-
install:
29-
- composer config --no-plugins allow-plugins.nodejs-php-fallback/nodejs-php-fallback true
30-
- composer install --no-interaction
31-
32-
pug/twig:
33-
autoload:
34-
- cp -r vendor/phug/phug vendor/phug/compiler
35-
- composer self-update 1.10.17
36-
- composer dump-autoload --optimize --no-interaction --quiet
37-
- composer self-update --2
27+
#pug/slim:
28+
# install:
29+
# - composer config --no-plugins allow-plugins.nodejs-php-fallback/nodejs-php-fallback true
30+
# - composer install --no-interaction
31+
32+
#pug/twig:
33+
# autoload:
34+
# - cp -r vendor/phug/phug vendor/phug/compiler
35+
# - composer self-update 1.10.17
36+
# - composer dump-autoload --optimize --no-interaction --quiet
37+
# - composer self-update --2
3838

3939
ci-pug/ci-pug:
4040
install:

0 commit comments

Comments
 (0)