From 522c29b7387a67a451231278bf79f446170bbc27 Mon Sep 17 00:00:00 2001 From: Steve Boyd Date: Mon, 1 Aug 2022 17:32:21 +1200 Subject: [PATCH] MNT Standardise modules --- .travis.yml | 38 -------------------------------------- README.md | 10 +++------- phpunit.xml.dist | 1 + 3 files changed, 4 insertions(+), 45 deletions(-) delete mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 6d48ed9d..00000000 --- a/.travis.yml +++ /dev/null @@ -1,38 +0,0 @@ -version: ~> 1.0 - -import: - - silverstripe/silverstripe-travis-shared:config/provision/standard.yml - -env: - global: - - REQUIRE_EXTRA="dnadesign/silverstripe-elemental:4.x-dev silverstripe/frameworktest:^0.4.4" - -matrix: - fast_finish: true - include: - # Note: PHPUNIT_COVERAGE_TEST was causing segmentation faults, so has been - # temporarily removed for now - - php: 7.4 - env: DB=PGSQL PHPUNIT_TEST=1 PHPCS_TEST=1 - - php: 8.0 - env: DB=MYSQL PDO=1 PHPUNIT_TEST=1 #PHPUNIT_COVERAGE_TEST=1 - - php: 7.4 - env: DB=MYSQL BEHAT_TEST=1 BEHAT_SUITE="asset-admin --config vendor/silverstripe/asset-admin/behat.yml" - - php: 8.0 - env: DB=PGSQL PHPUNIT_TEST=1 - - php: 8.0 - env: DB=MYSQL BEHAT_TEST=1 BEHAT_SUITE="silverstripe-elemental --config vendor/dnadesign/silverstripe-elemental/behat.yml" - - php: 8.1.0 - env: DB=MYSQL PHPUNIT_TEST=1 - -before_script: - # separately create artifacts directory for asset-admin behat test - - if [[ $BEHAT_TEST ]] && [[ $BEHAT_SUITE =~ asset\-admin ]]; then mkdir ./vendor/silverstripe/asset-admin/artifacts; fi - # separately create artifacts directory for silverstripe-elemental behat test - - if [[ $BEHAT_TEST ]] && [[ $BEHAT_SUITE =~ silverstripe\-elemental ]]; then mkdir ./vendor/dnadesign/silverstripe-elemental/artifacts; fi - -after_failure: - # upload artifacts from asset-admin behat test - - if [[ $BEHAT_TEST ]] && [[ $BEHAT_SUITE =~ asset\-admin ]]; then php ./vendor/silverstripe/framework/tests/behat/travis-upload-artifacts.php --if-env BEHAT_TEST,ARTIFACTS_BUCKET,ARTIFACTS_KEY,ARTIFACTS_SECRET --target-path $TRAVIS_REPO_SLUG/$TRAVIS_BUILD_ID/$TRAVIS_JOB_ID --artifacts-base-url https://s3.amazonaws.com/$ARTIFACTS_BUCKET/ --artifacts-path ./vendor/silverstripe/asset-admin/artifacts/; fi - # upload artifacts from elemental behat test - - if [[ $BEHAT_TEST ]] && [[ $BEHAT_SUITE =~ silverstripe\-elemental ]]; then php ./vendor/silverstripe/framework/tests/behat/travis-upload-artifacts.php --if-env BEHAT_TEST,ARTIFACTS_BUCKET,ARTIFACTS_KEY,ARTIFACTS_SECRET --target-path $TRAVIS_REPO_SLUG/$TRAVIS_BUILD_ID/$TRAVIS_JOB_ID --artifacts-base-url https://s3.amazonaws.com/$ARTIFACTS_BUCKET/ --artifacts-path ./vendor/dnadesign/silverstripe-elemental/artifacts/; fi diff --git a/README.md b/README.md index bb85e229..d6af9ee4 100644 --- a/README.md +++ b/README.md @@ -1,22 +1,19 @@ # Silverstripe CMS GraphQL Server [![CI](https://github.com/silverstripe/silverstripe-graphql/actions/workflows/ci.yml/badge.svg)](https://github.com/silverstripe/silverstripe-graphql/actions/workflows/ci.yml) -[![codecov](https://codecov.io/gh/silverstripe/silverstripe-graphql/branch/master/graph/badge.svg)](https://codecov.io/gh/silverstripe/silverstripe-graphql) -[![SilverStripe supported module](https://img.shields.io/badge/silverstripe-supported-0071C4.svg)](https://www.silverstripe.org/software/addons/silverstripe-commercially-supported-module-list/) +[![Silverstripe supported module](https://img.shields.io/badge/silverstripe-supported-0071C4.svg)](https://www.silverstripe.org/software/addons/silverstripe-commercially-supported-module-list/) -This modules serves SilverStripe data as +This modules serves Silverstripe data as [GraphQL](http://facebook.github.io/react/blog/2015/05/01/graphql-introduction.html) -representations, with helpers to generate schemas based on SilverStripe model +representations, with helpers to generate schemas based on Silverstripe model introspection. It layers a pluggable schema registration system on top of the [graphql-php](https://github.com/webonyx/graphql-php) library. The APIs are very similar. - ## This is the 4.x pre-release branch The stable release of this module is on the default `3` branch, which contains documentation inlined into the README. Documentation for this release is on the [main documentation site](https://doc.silverstripe.org/en/4/developer_guides/graphql/). - ## Installing on silverstripe/recipe-cms < 4.11 If your project uses silverstripe/recipe-cms, it is still locked to the stable release `silverstripe/graphql:^3`. To use `silverstripe/graphql:^4`, you'll need to "inline" the `silverstripe/recipe-cms` requirements in your root `composer.json` and change `silverstripe/graphql` to `^4`. @@ -29,7 +26,6 @@ composer update-recipe silverstripe/recipe-cms Alternatively, you can remove `silverstripe/recipe-cms` from your root `composer.json` and replace it with the the contents of the `composer.json` in `silverstripe/recipe-cms`. - ## Documentation See [doc.silverstripe.org](https://doc.silverstripe.org/en/4/developer_guides/graphql/). diff --git a/phpunit.xml.dist b/phpunit.xml.dist index 0281bef3..718b2ac6 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -1,3 +1,4 @@ +