Skip to content

Commit 2bec56a

Browse files
committed
Re-add pug/twig
1 parent 0260cba commit 2bec56a

3 files changed

Lines changed: 14 additions & 39 deletions

File tree

.github/workflows/multi-tester.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,15 +31,15 @@ jobs:
3131
uses: actions/cache@v5
3232
with:
3333
path: vendor
34-
key: ${{ runner.os }}-multi-test-v2-${{ matrix.php }}-${{ hashFiles('**/composer.lock') }}
34+
key: ${{ runner.os }}-multi-test-${{ matrix.php }}-${{ hashFiles('**/composer.lock') }}
3535
restore-keys: |
36-
${{ runner.os }}-multi-test-v2-${{ matrix.php }}-
36+
${{ runner.os }}-multi-test-${{ matrix.php }}-
3737
3838
- name: Install dependencies
3939
if: steps.composer-cache.outputs.cache-hit != 'true'
4040
run: |
4141
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
42-
composer require kylekatarnls/multi-tester:^2.6.0 --dev --no-update --no-interaction
42+
composer require "kylekatarnls/multi-tester:^2.6.1" --dev --no-update --no-interaction
4343
composer update --prefer-dist --prefer-${{ matrix.setup }} --no-progress --no-interaction
4444
4545
- name: Run test suites

.multi-tester.yml

Lines changed: 8 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -13,31 +13,18 @@ pug/bemto:
1313
- composer dump-autoload --optimize --no-interaction --quiet
1414

1515
pug-php/pug-assets:
16-
install:
17-
- composer config --no-plugins allow-plugins.nodejs-php-fallback/nodejs-php-fallback true
18-
- composer install --no-interaction
16+
allow-plugins: nodejs-php-fallback/nodejs-php-fallback
1917

2018
pug-php/pug-minify:
21-
install:
22-
- composer config --no-plugins allow-plugins.nodejs-php-fallback/nodejs-php-fallback true
23-
- composer install --no-interaction
19+
allow-plugins: nodejs-php-fallback/nodejs-php-fallback
2420

2521
#pug/slim:
26-
# install:
27-
# - composer config --no-plugins allow-plugins.nodejs-php-fallback/nodejs-php-fallback true
28-
# - composer install --no-interaction
22+
# allow-plugins: nodejs-php-fallback/nodejs-php-fallback
2923

30-
#pug/twig:
31-
# autoload:
32-
# - cp -r vendor/phug/phug vendor/phug/compiler
33-
# - composer self-update 1.10.17
34-
# - composer dump-autoload --optimize --no-interaction --quiet
35-
# - composer self-update --2
24+
pug/twig: default
3625

3726
ci-pug/ci-pug:
38-
install:
39-
- composer config --no-plugins allow-plugins.nodejs-php-fallback/nodejs-php-fallback true
40-
- composer install --no-interaction
27+
allow-plugins: nodejs-php-fallback/nodejs-php-fallback
4128

4229
bkwld/laravel-pug:
4330
source:
@@ -48,7 +35,6 @@ bkwld/laravel-pug:
4835
script: github
4936

5037
pug/yii2:
51-
install:
52-
- composer config --no-plugins allow-plugins.yiisoft/yii2-composer true
53-
- composer config --no-plugins allow-plugins.nodejs-php-fallback/nodejs-php-fallback true
54-
- composer install --no-interaction
38+
allow-plugins:
39+
- yiisoft/yii2-composer
40+
- nodejs-php-fallback/nodejs-php-fallback

composer.json

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -26,20 +26,6 @@
2626
"php": "^7.1 || ^8.0",
2727
"symfony/var-dumper": "^3.4 || ^4.0 || ^5.0 || ^6.0 || ^7.0 || ^8.0"
2828
},
29-
"require-dev": {
30-
"cebe/markdown": "^1.1",
31-
"js-phpize/js-phpize-phug": "^2.2.1",
32-
"nodejs-php-fallback/coffeescript": "^1.0.1",
33-
"nodejs-php-fallback/less": "^1.0.5",
34-
"nodejs-php-fallback/stylus": "^1.0.4",
35-
"nodejs-php-fallback/uglify": "^1.0.4",
36-
"phpunit/phpunit": "^7.5.20 || ^8.5.52 || ^9.6.34",
37-
"phpunit/php-code-coverage": "^6.1.4 || ^7.0.17 || ^9.2.32",
38-
"phpunit/php-invoker": "^1.1.4 || ^3.1.1",
39-
"pug-php/pug": "^3.4.1",
40-
"pug-php/pug-filter-coffee-script": "^1.3.1",
41-
"squizlabs/php_codesniffer": "^3.13.5"
42-
},
4329
"replace": {
4430
"phug/ast": "self.version",
4531
"phug/compiler": "self.version",
@@ -90,5 +76,8 @@
9076
"allow-plugins": {
9177
"nodejs-php-fallback/nodejs-php-fallback": true
9278
}
79+
},
80+
"require-dev": {
81+
"kylekatarnls/multi-tester": "dev-feature/replace-packages"
9382
}
9483
}

0 commit comments

Comments
 (0)