Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix issue with flex, with Symfony upgrade to 5.4 and sync-recipes on init #670

Merged
merged 5 commits into from
Feb 22, 2022
Merged

Fix issue with flex, with Symfony upgrade to 5.4 and sync-recipes on init #670

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1015daa
Fix issue with flex, with Symfony upgrade to 5.4 and sync-recipes on …
andytson-inviqa Feb 18, 2022
1527a4e
Initialise project fully before static tests
andytson-inviqa Feb 18, 2022
270b5ea
Add additional newly required components
andytson-inviqa Feb 18, 2022
127ca8a
Add switch to dynamic build in init.sh instead
andytson-inviqa Feb 21, 2022
c9df63b
Remove unnecessary quotes
andytson-inviqa Feb 21, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions src/symfony/.ci/sample-static/init.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
#!/bin/bash

set -o errexit

if ! [ -e symfony.lock ]; then
ws set app.build dynamic

# ensure a full build is done dynamically to get all repo artifacts
export MY127WS_ENV=local # static tests switch to pipeline
ws harness prepare
ws enable console
ws destroy

ws set app.build static
fi

2 changes: 2 additions & 0 deletions src/symfony/.ci/sample-static/workspace.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,6 @@ attribute('app.repository'): null
attribute('aws.access_key_id'): null
attribute('aws.secret_access_key'): null

attribute('docker.port_forward.enabled'): false

attribute('composer.auth.github'): = decrypt("YTozOntpOjA7czo3OiJkZWZhdWx0IjtpOjE7czoyNDoiZfbsRN210rxOzGyHhH74tuXtFxak6prxIjtpOjI7czo1Njoi7NjB2oXZJ3/wQsccea2VPeYEjU72koVub89ezkdQzAzOaaFwD2Rm1pbhWXR7aYgpUdXmNmO8g5YiO30=")
17 changes: 12 additions & 5 deletions src/symfony/application/skeleton/composer.json.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,13 @@
"php": ">= 8.0",
"ext-ctype": "*",
"ext-iconv": "*",
"symfony/console": "5.2.*",
"symfony/dotenv": "5.2.*",
"symfony/flex": "^1.12",
"symfony/framework-bundle": "5.2.*",
"symfony/yaml": "5.2.*"
"symfony/console": "~5.4",
"symfony/dotenv": "~5.4",
"symfony/flex": "^2.1",
"symfony/framework-bundle": "~5.4",
"symfony/runtime": "~5.4",
"symfony/translation": "~5.4",
"symfony/yaml": "~5.4"
},
"require-dev": {
"behat/behat": "^3.5",
Expand All @@ -32,6 +34,10 @@
"symfony/phpunit-bridge": "^5.2"
},
"config": {
"allow-plugins": {
"symfony/flex": true,
"symfony/runtime": true
},
"bin-dir": "bin",
"optimize-autoloader": true,
"platform": {
Expand Down Expand Up @@ -71,6 +77,7 @@
"@auto-scripts"
],
"post-update-cmd": [
"[ -e symfony.lock ] || composer sync-recipes",
"@auto-scripts"
],
"test": [
Expand Down
5 changes: 5 additions & 0 deletions test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,11 @@ function setup()
function prepare_environment()
(
cd "${path_test}"

if [ -e init.sh ]; then
bash -x ./init.sh
fi

ws harness prepare
)

Expand Down