Skip to content

Commit

Permalink
Merge branch 'feature/sulu-upgrade-2-6-3' into 'master'
Browse files Browse the repository at this point in the history
Upgrade Sulu to 2.6.3

See merge request webapps/sulu-demo!155
  • Loading branch information
Prokyonn committed Jul 2, 2024
2 parents 86dd17e + 5bae3fa commit 0dfb9f8
Show file tree
Hide file tree
Showing 10 changed files with 219 additions and 215 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/test-application.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:

jobs:
php:
name: PHP 8.1
name: PHP 8.2
runs-on: ubuntu-latest

services:
Expand Down Expand Up @@ -36,7 +36,7 @@ jobs:
- name: Install and configure PHP
uses: shivammathur/setup-php@v2
with:
php-version: '8.1'
php-version: '8.2'
extensions: ctype, iconv, mysql
coverage: none
tools: composer
Expand All @@ -59,7 +59,7 @@ jobs:
run: bin/console sulu:build dev --destroy

js-css-website:
name: Node 12 / Website
name: Node 18 / Website
runs-on: ubuntu-latest
defaults:
run:
Expand All @@ -72,7 +72,7 @@ jobs:
- name: Install and configure Node
uses: actions/setup-node@v2-beta
with:
node-version: '12'
node-version: '18'

- name: Install npm dependencies
uses: bahmutov/npm-install@v1
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"scheb/2fa-email": "^7.2",
"scheb/2fa-trusted-device": "^7.2",
"stof/doctrine-extensions-bundle": "^1.8",
"sulu/sulu": "~2.6.2",
"sulu/sulu": "~2.6.3",
"symfony/config": "^6.4",
"symfony/dotenv": "^6.4",
"symfony/flex": "^1.17 || ^2.0",
Expand Down
Loading

0 comments on commit 0dfb9f8

Please sign in to comment.