Skip to content

Commit 0a54d16

Browse files
committed
Merge branch '5.4' into 6.4
* 5.4: add the Workflow component Update actions/checkout update ramsey/composer-install GitHub action to version 2 (#23)
2 parents 8569b39 + 5e93b50 commit 0a54d16

File tree

4 files changed

+17
-2
lines changed

4 files changed

+17
-2
lines changed

.github/workflows/ci.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111

1212
steps:
1313
- name: Checkout code
14-
uses: actions/checkout@v2
14+
uses: actions/checkout@v4
1515

1616
- name: Set up PHP
1717
uses: shivammathur/setup-php@v2
@@ -20,7 +20,7 @@ jobs:
2020
coverage: none
2121

2222
- name: Download dependencies
23-
uses: ramsey/composer-install@v1
23+
uses: ramsey/composer-install@v2
2424

2525
- name: Run tests
2626
run: ./bin/console cache:warmup --env dev

composer.json

+1
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@
4242
"symfony/validator": "6.4.*",
4343
"symfony/web-link": "6.4.*",
4444
"symfony/webpack-encore-bundle": "^1.11",
45+
"symfony/workflow": "6.4.*",
4546
"symfony/yaml": "6.4.*",
4647
"twig/extra-bundle": "^3.0",
4748
"twig/twig": "^3.0"

config/packages/workflow.yaml

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
framework:
2+
workflows: null

symfony.lock

+12
Original file line numberDiff line numberDiff line change
@@ -595,6 +595,18 @@
595595
"webpack.config.js"
596596
]
597597
},
598+
"symfony/workflow": {
599+
"version": "5.4",
600+
"recipe": {
601+
"repo": "github.com/symfony/recipes",
602+
"branch": "main",
603+
"version": "3.3",
604+
"ref": "3b2f8ca32a07fcb00f899649053943fa3d8bbfb6"
605+
},
606+
"files": [
607+
"config/packages/workflow.yaml"
608+
]
609+
},
598610
"symfony/yaml": {
599611
"version": "v5.4.0"
600612
},

0 commit comments

Comments
 (0)