From 72fffa4c1e833b00baf59f6591f0a77b7a05d478 Mon Sep 17 00:00:00 2001 From: Nyholm Date: Sun, 3 May 2020 14:05:48 +0200 Subject: [PATCH 01/13] Allow jobs to fail on SF 3.4. --- .travis.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.travis.yml b/.travis.yml index 37bf3b5e..2561461d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,6 +14,9 @@ matrix: env: SKELETON_VERSION="^4.4" - php: 7.4 env: SKELETON_VERSION="^5.0" + allow_failures: + - php: 7.4 + env: SKELETON_VERSION="^3.4" before_install: - phpenv config-rm xdebug.ini || true From 8c1205b0482f4145ee008629d5b0d62c51cb0888 Mon Sep 17 00:00:00 2001 From: Nyholm Date: Thu, 25 Jun 2020 12:26:11 +0200 Subject: [PATCH 02/13] Trying out new config --- .travis.yml | 15 ++++++++++++++- .../1.0/config/packages/async_aws.yaml | 6 ++++++ async-aws/async-aws-bundle/1.0/manifest.json | 8 ++++++++ 3 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 async-aws/async-aws-bundle/1.0/config/packages/async_aws.yaml create mode 100644 async-aws/async-aws-bundle/1.0/manifest.json diff --git a/.travis.yml b/.travis.yml index 2561461d..a79edc5d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -30,4 +30,17 @@ install: - composer config extra.symfony.allow-contrib true script: - - composer req --ignore-platform-reqs $(echo $PACKAGES) + - | + EXIT_CODE=$(composer req --ignore-platform-reqs $(echo $PACKAGES)) + if [[ EXIT_CODE -eq 0 ]]; then + exit 0; + elif [[ EXIT_CODE -eq 1 ]]; then + echo "Could not install package"; + exit 1; + elif [[ EXIT_CODE -eq 2 ]]; then + echo "Could not resolve dependencies. You can ignore this error if your package does not support Symfony $SKELETON_VERSION"; + exit 1; + fi + + exit $EXIT_CODE; + diff --git a/async-aws/async-aws-bundle/1.0/config/packages/async_aws.yaml b/async-aws/async-aws-bundle/1.0/config/packages/async_aws.yaml new file mode 100644 index 00000000..a421c703 --- /dev/null +++ b/async-aws/async-aws-bundle/1.0/config/packages/async_aws.yaml @@ -0,0 +1,6 @@ +# Read documentation at https://async-aws.com/integration/symfony-bundle.html +async_aws: + config: + + # All installed clients are automatically autowired. Use this section to customize clients + clients: diff --git a/async-aws/async-aws-bundle/1.0/manifest.json b/async-aws/async-aws-bundle/1.0/manifest.json new file mode 100644 index 00000000..f7acf1e8 --- /dev/null +++ b/async-aws/async-aws-bundle/1.0/manifest.json @@ -0,0 +1,8 @@ +{ + "bundles": { + "AsyncAws\\Symfony\\Bundle\\AsyncAwsBundle": ["all"] + }, + "copy-from-recipe": { + "config/": "%CONFIG_DIR%/" + } +} From a7c052d3fdaafe988e02e4a2747460a17189e939 Mon Sep 17 00:00:00 2001 From: Nyholm Date: Thu, 25 Jun 2020 12:32:36 +0200 Subject: [PATCH 03/13] minor --- .travis.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index a79edc5d..a13bbb23 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,9 +14,6 @@ matrix: env: SKELETON_VERSION="^4.4" - php: 7.4 env: SKELETON_VERSION="^5.0" - allow_failures: - - php: 7.4 - env: SKELETON_VERSION="^3.4" before_install: - phpenv config-rm xdebug.ini || true @@ -31,7 +28,8 @@ install: script: - | - EXIT_CODE=$(composer req --ignore-platform-reqs $(echo $PACKAGES)) + EXIT_CODE=$(composer req --ignore-platform-reqs $(echo $PACKAGES)); + echo "Exit code: $EXIT_CODE"; if [[ EXIT_CODE -eq 0 ]]; then exit 0; elif [[ EXIT_CODE -eq 1 ]]; then From 48113aa9616714313e26e29a9f12c446bdeb1da5 Mon Sep 17 00:00:00 2001 From: Nyholm Date: Thu, 25 Jun 2020 12:39:07 +0200 Subject: [PATCH 04/13] syntax --- .travis.yml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index a13bbb23..3aed479f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,17 +28,18 @@ install: script: - | - EXIT_CODE=$(composer req --ignore-platform-reqs $(echo $PACKAGES)); + composer req --ignore-platform-reqs $(echo $PACKAGES) + EXIT_CODE=$? echo "Exit code: $EXIT_CODE"; + MESSAGE=""; if [[ EXIT_CODE -eq 0 ]]; then exit 0; elif [[ EXIT_CODE -eq 1 ]]; then - echo "Could not install package"; - exit 1; + MESSAGE="Could not install package"; elif [[ EXIT_CODE -eq 2 ]]; then - echo "Could not resolve dependencies. You can ignore this error if your package does not support Symfony $SKELETON_VERSION"; - exit 1; + MESSAGE="Could not resolve dependencies. You can ignore this error if your package does not support Symfony $SKELETON_VERSION"; fi + echo -e "#\n#\n#\n#\n# $MESSAGE\n#\n#\n#\n#\n"; exit $EXIT_CODE; From 6c2493dd895813d95c229f638aab10c65b2f3da4 Mon Sep 17 00:00:00 2001 From: Nyholm Date: Thu, 25 Jun 2020 12:45:03 +0200 Subject: [PATCH 05/13] Use function --- .travis.yml | 37 ++++++++++++++++++++++--------------- 1 file changed, 22 insertions(+), 15 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3aed479f..df426d81 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,6 +14,9 @@ matrix: env: SKELETON_VERSION="^4.4" - php: 7.4 env: SKELETON_VERSION="^5.0" + allow_failures: + - php: 7.4 + env: SKELETON_VERSION="^3.4" before_install: - phpenv config-rm xdebug.ini || true @@ -26,20 +29,24 @@ install: - cd flex - composer config extra.symfony.allow-contrib true -script: - - | - composer req --ignore-platform-reqs $(echo $PACKAGES) - EXIT_CODE=$? - echo "Exit code: $EXIT_CODE"; - MESSAGE=""; - if [[ EXIT_CODE -eq 0 ]]; then - exit 0; - elif [[ EXIT_CODE -eq 1 ]]; then - MESSAGE="Could not install package"; - elif [[ EXIT_CODE -eq 2 ]]; then - MESSAGE="Could not resolve dependencies. You can ignore this error if your package does not support Symfony $SKELETON_VERSION"; - fi +before_script: + - | + install_package() { + composer require --ignore-platform-reqs $1 + EXIT_CODE=$? - echo -e "#\n#\n#\n#\n# $MESSAGE\n#\n#\n#\n#\n"; - exit $EXIT_CODE; + MESSAGE=""; + if [[ EXIT_CODE -eq 0 ]]; then + exit 0; + elif [[ EXIT_CODE -eq 1 ]]; then + MESSAGE="Could not install package"; + elif [[ EXIT_CODE -eq 2 ]]; then + MESSAGE="Could not resolve dependencies.\n# You can ignore this error if your package does not support Symfony $SKELETON_VERSION"; + fi + echo -e "#\n#\n#\n# $MESSAGE\n#\n#\n#\n"; + exit $EXIT_CODE; + } + export -f install_package + +script: install_package $(echo $PACKAGES) From 5b7e09fa08641612730ba0661b474ba7db449c10 Mon Sep 17 00:00:00 2001 From: Nyholm Date: Thu, 25 Jun 2020 12:45:55 +0200 Subject: [PATCH 06/13] minor --- .../0.1/config/packages/happyr_json_api_response_factory.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/happyr/json-api-response-factory/0.1/config/packages/happyr_json_api_response_factory.yaml b/happyr/json-api-response-factory/0.1/config/packages/happyr_json_api_response_factory.yaml index 81962a2d..9eda8997 100644 --- a/happyr/json-api-response-factory/0.1/config/packages/happyr_json_api_response_factory.yaml +++ b/happyr/json-api-response-factory/0.1/config/packages/happyr_json_api_response_factory.yaml @@ -1,4 +1,5 @@ services: + Happyr\JsonApiResponseFactory\ResponseFactory: arguments: ['@happyr.fractal.manager'] From 4303edbc81a8349d45fa7a9bb3ea57170f3da93d Mon Sep 17 00:00:00 2001 From: Nyholm Date: Thu, 25 Jun 2020 12:47:37 +0200 Subject: [PATCH 07/13] Indentation --- .travis.yml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/.travis.yml b/.travis.yml index df426d81..59f58759 100644 --- a/.travis.yml +++ b/.travis.yml @@ -31,22 +31,22 @@ install: before_script: - | - install_package() { - composer require --ignore-platform-reqs $1 - EXIT_CODE=$? + install_package() { + composer require --ignore-platform-reqs $1 + EXIT_CODE=$? - MESSAGE=""; - if [[ EXIT_CODE -eq 0 ]]; then + MESSAGE=""; + if [[ EXIT_CODE -eq 0 ]]; then exit 0; - elif [[ EXIT_CODE -eq 1 ]]; then + elif [[ EXIT_CODE -eq 1 ]]; then MESSAGE="Could not install package"; - elif [[ EXIT_CODE -eq 2 ]]; then + elif [[ EXIT_CODE -eq 2 ]]; then MESSAGE="Could not resolve dependencies.\n# You can ignore this error if your package does not support Symfony $SKELETON_VERSION"; - fi + fi - echo -e "#\n#\n#\n# $MESSAGE\n#\n#\n#\n"; - exit $EXIT_CODE; - } - export -f install_package + echo -e "#\n#\n#\n# $MESSAGE\n#\n#\n#\n"; + exit $EXIT_CODE; + } + export -f install_package script: install_package $(echo $PACKAGES) From fb4d8b88859687637fa2f0ea852574fd35d5f9d0 Mon Sep 17 00:00:00 2001 From: Nyholm Date: Thu, 25 Jun 2020 12:50:07 +0200 Subject: [PATCH 08/13] make sure we support multiple packages --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 59f58759..4671f200 100644 --- a/.travis.yml +++ b/.travis.yml @@ -32,8 +32,8 @@ install: before_script: - | install_package() { - composer require --ignore-platform-reqs $1 - EXIT_CODE=$? + composer require --ignore-platform-reqs $(echo $1); + EXIT_CODE=$?; MESSAGE=""; if [[ EXIT_CODE -eq 0 ]]; then @@ -49,4 +49,4 @@ before_script: } export -f install_package -script: install_package $(echo $PACKAGES) +script: install_package $PACKAGES From 3323b01b72c6f534f23acc04874cfe8fce4edb93 Mon Sep 17 00:00:00 2001 From: Nyholm Date: Thu, 25 Jun 2020 12:54:16 +0200 Subject: [PATCH 09/13] use second argument --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4671f200..344a0e30 100644 --- a/.travis.yml +++ b/.travis.yml @@ -32,7 +32,7 @@ install: before_script: - | install_package() { - composer require --ignore-platform-reqs $(echo $1); + composer require --ignore-platform-reqs $1 $2; EXIT_CODE=$?; MESSAGE=""; @@ -49,4 +49,4 @@ before_script: } export -f install_package -script: install_package $PACKAGES +script: install_package $(echo $PACKAGES) From 541d83681f58949aa1a00278774b4b9bc89f3488 Mon Sep 17 00:00:00 2001 From: Nyholm Date: Thu, 25 Jun 2020 12:55:15 +0200 Subject: [PATCH 10/13] syntax --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 344a0e30..c238ccdb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -32,7 +32,7 @@ install: before_script: - | install_package() { - composer require --ignore-platform-reqs $1 $2; + composer require --ignore-platform-reqs $@; EXIT_CODE=$?; MESSAGE=""; From d10866f489754eec876175c90ddbec4d2634186d Mon Sep 17 00:00:00 2001 From: Nyholm Date: Thu, 25 Jun 2020 12:56:38 +0200 Subject: [PATCH 11/13] Revert changes in second package --- .../0.1/config/packages/happyr_json_api_response_factory.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/happyr/json-api-response-factory/0.1/config/packages/happyr_json_api_response_factory.yaml b/happyr/json-api-response-factory/0.1/config/packages/happyr_json_api_response_factory.yaml index 9eda8997..81962a2d 100644 --- a/happyr/json-api-response-factory/0.1/config/packages/happyr_json_api_response_factory.yaml +++ b/happyr/json-api-response-factory/0.1/config/packages/happyr_json_api_response_factory.yaml @@ -1,5 +1,4 @@ services: - Happyr\JsonApiResponseFactory\ResponseFactory: arguments: ['@happyr.fractal.manager'] From 817ce1650229f0f2aaea1d8fbc55e723411be459 Mon Sep 17 00:00:00 2001 From: Nyholm Date: Thu, 25 Jun 2020 13:02:44 +0200 Subject: [PATCH 12/13] force error --- .travis.yml | 2 +- async-aws/async-aws-bundle/1.0/config/packages/async_aws.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index c238ccdb..68d99c13 100644 --- a/.travis.yml +++ b/.travis.yml @@ -39,7 +39,7 @@ before_script: if [[ EXIT_CODE -eq 0 ]]; then exit 0; elif [[ EXIT_CODE -eq 1 ]]; then - MESSAGE="Could not install package"; + MESSAGE="Could not install package and configure package."; elif [[ EXIT_CODE -eq 2 ]]; then MESSAGE="Could not resolve dependencies.\n# You can ignore this error if your package does not support Symfony $SKELETON_VERSION"; fi diff --git a/async-aws/async-aws-bundle/1.0/config/packages/async_aws.yaml b/async-aws/async-aws-bundle/1.0/config/packages/async_aws.yaml index a421c703..574d7104 100644 --- a/async-aws/async-aws-bundle/1.0/config/packages/async_aws.yaml +++ b/async-aws/async-aws-bundle/1.0/config/packages/async_aws.yaml @@ -3,4 +3,4 @@ async_aws: config: # All installed clients are automatically autowired. Use this section to customize clients - clients: + cliXXXents: From 15ac1c3de235ebd21925fd72053b320a15c44e3e Mon Sep 17 00:00:00 2001 From: Nyholm Date: Thu, 25 Jun 2020 13:27:40 +0200 Subject: [PATCH 13/13] remove tmp code --- .travis.yml | 2 +- async-aws/async-aws-bundle/1.0/config/packages/async_aws.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 68d99c13..76b43896 100644 --- a/.travis.yml +++ b/.travis.yml @@ -44,7 +44,7 @@ before_script: MESSAGE="Could not resolve dependencies.\n# You can ignore this error if your package does not support Symfony $SKELETON_VERSION"; fi - echo -e "#\n#\n#\n# $MESSAGE\n#\n#\n#\n"; + echo -e "\n#\n#\n# $MESSAGE\n#\n#\n#\n"; exit $EXIT_CODE; } export -f install_package diff --git a/async-aws/async-aws-bundle/1.0/config/packages/async_aws.yaml b/async-aws/async-aws-bundle/1.0/config/packages/async_aws.yaml index 574d7104..a421c703 100644 --- a/async-aws/async-aws-bundle/1.0/config/packages/async_aws.yaml +++ b/async-aws/async-aws-bundle/1.0/config/packages/async_aws.yaml @@ -3,4 +3,4 @@ async_aws: config: # All installed clients are automatically autowired. Use this section to customize clients - cliXXXents: + clients: