Skip to content

Commit cb0bafd

Browse files
committed
Fix actions due to obsolete Ubuntu runner version
1 parent af2ee3a commit cb0bafd

File tree

3 files changed

+28
-16
lines changed

3 files changed

+28
-16
lines changed

.github/workflows/code_checks.yaml

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on: ["push", "pull_request"]
66
jobs:
77
js-tests:
88
name: "JS Tests"
9-
runs-on: ubuntu-20.04
9+
runs-on: ubuntu-24.04
1010
steps:
1111
- name: Checkout
1212
uses: actions/checkout@v3
@@ -15,16 +15,19 @@ jobs:
1515
run: |
1616
cd Resources && npm install
1717
18+
- name: Install PHP dependencies (for PhantomJS)
19+
uses: ramsey/composer-install@v2
20+
1821
- name: Run JS tests
1922
run: |
2023
cd Resources && npm run test
2124
phpunit:
2225
name: "PHP ${{ matrix.php }} + ${{ matrix.dependencies }} dependencies + Symfony ${{ matrix.symfony }}"
23-
runs-on: ubuntu-20.04
26+
runs-on: ubuntu-24.04
2427
strategy:
2528
fail-fast: false
2629
matrix:
27-
php: ['8.0', '8.1', '8.2']
30+
php: ['8.0', '8.1', '8.2', '8.3', '8.4']
2831
dependencies: [highest]
2932
symfony: ['*']
3033
include:
@@ -34,11 +37,11 @@ jobs:
3437
symfony: '*'
3538

3639
# Minimum supported dependencies with the latest supported PHP version
37-
- php: '8.2'
40+
- php: '8.4'
3841
dependencies: lowest
3942
symfony: '*'
4043

41-
- php: '8.2'
44+
- php: '8.4'
4245
dependencies: highest
4346
symfony: '*'
4447

@@ -48,13 +51,9 @@ jobs:
4851
dependencies: highest
4952
symfony: '5.4.*'
5053

51-
- php: '8.0'
52-
dependencies: highest
53-
symfony: '6.0.*'
54-
5554
- php: '8.1'
5655
dependencies: highest
57-
symfony: '6.2.*'
56+
symfony: '6.4.*'
5857

5958
- php: '8.2'
6059
dependencies: highest

Resources/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
"scripts": {
4545
"build": "gulp && npm run build:types",
4646
"build:types": "tsc --declaration --emitDeclarationOnly",
47-
"test": "npm run build && npm run test:types && phantomjs js/run_jsunit.js js/router_test.html",
47+
"test": "npm run build && npm run test:types && ../bin/phantomjs js/run_jsunit.js js/router_test.html",
4848
"test:types": "tsd",
4949
"prepublish": "npm run build"
5050
},

composer.json

Lines changed: 18 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,24 +17,37 @@
1717
],
1818
"require": {
1919
"php": "^8.0",
20-
"symfony/framework-bundle": "^5.4|^6.0|^7.0",
21-
"symfony/serializer": "^5.4|^6.0.1|^7.0",
22-
"symfony/console": "^5.4|^6.0|^7.0",
20+
"symfony/framework-bundle": "^5.4|^6.4|^7.0",
21+
"symfony/serializer": "^5.4|^6.4|^7.0",
22+
"symfony/console": "^5.4|^6.4|^7.0",
2323
"willdurand/jsonp-callback-validator": "~1.1|^2.0"
2424
},
2525
"require-dev": {
26-
"symfony/expression-language": "^5.4|^6.0|^7.0",
27-
"symfony/phpunit-bridge": "^5.4|^6.0|^7.0"
26+
"neronmoon/scriptsdev": "^0.1",
27+
"jakoch/phantomjs-installer": "^3",
28+
"symfony/expression-language": "^5.4|^6.4|^7.0",
29+
"symfony/phpunit-bridge": "^5.4|^6.4|^7.0"
2830
},
2931
"autoload": {
3032
"psr-4": { "FOS\\JsRoutingBundle\\": "" },
3133
"exclude-from-classmap": [
3234
"/Tests/"
3335
]
3436
},
37+
"config": {
38+
"bin-dir": "bin"
39+
},
3540
"extra": {
3641
"branch-alias": {
3742
"dev-master": "3.x-dev"
43+
},
44+
"scripts-dev": {
45+
"post-install-cmd": [
46+
"PhantomInstaller\\Installer::installPhantomJS"
47+
],
48+
"post-update-cmd": [
49+
"PhantomInstaller\\Installer::installPhantomJS"
50+
]
3851
}
3952
}
4053
}

0 commit comments

Comments
 (0)