diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b7a46e9..3b8ad97 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -12,7 +12,7 @@ jobs: ci: name: CI # Only run cron on the silverstripe account - if: (github.event_name == 'schedule' && startsWith(github.repository, 'silverstripe/')) || (github.event_name != 'schedule') + if: (github.event_name == 'schedule' && github.repository_owner == 'silverstripe') || (github.event_name != 'schedule') uses: silverstripe/gha-ci/.github/workflows/ci.yml@v1 with: # installer contains a sample behat.yml file, though there are no behat tests to run diff --git a/.github/workflows/keepalive.yml b/.github/workflows/keepalive.yml index 4164686..abba00d 100644 --- a/.github/workflows/keepalive.yml +++ b/.github/workflows/keepalive.yml @@ -10,7 +10,7 @@ jobs: keepalive: name: Keepalive # Only run cron on the silverstripe account - if: (github.event_name == 'schedule' && startsWith(github.repository, 'silverstripe/')) || (github.event_name != 'schedule') + if: (github.event_name == 'schedule' && github.repository_owner == 'silverstripe') || (github.event_name != 'schedule') runs-on: ubuntu-latest steps: - name: Keepalive diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index c1323b0..0000000 --- a/.travis.yml +++ /dev/null @@ -1,84 +0,0 @@ -version: ~> 1.0 - -import: - - silverstripe/silverstripe-travis-shared:config/provision/self.yml - -env: - global: - - REQUIRE_RECIPE_TESTING="^2" - - REQUIRE_FRAMEWORKTEST="^0.4.2" - # vfsstream is a dev dependency of the assets module - - REQUIRE_EXTRA="mikey179/vfsstream:^1.6" - -matrix: - fast_finish: true - include: - # Core php tests - - php: 7.3 - env: - - DB=MYSQL - - PHPUNIT_TEST=1 - - PHPUNIT_SUITE="core" - - PDO=1 - - COMPOSER_INSTALL_ARG="--prefer-lowest" - - php: 7.3 - env: - - DB=MYSQL - - PHPUNIT_TEST=1 - - PHPUNIT_SUITE="framework" - - php: 7.3 - env: - - DB=PGSQL - - PHPUNIT_TEST=1 - - PHPUNIT_SUITE="core" - - php: 7.4 - env: - - DB=MYSQL - - PHPUNIT_TEST=1 - - PHPUNIT_SUITE="core" - - php: 8.0 - env: - - DB=MYSQL - - PHPUNIT_TEST=1 - - PHPUNIT_SUITE="core" - - COMPOSER_INSTALL_ARG="--ignore-platform-reqs" - # admin php tests - - php: 7.3 - env: - - DB=MYSQL - - PHPUNIT_TEST=1 - - PHPUNIT_SUITE="admin" - - PDO=1 - - COMPOSER_INSTALL_ARG="--prefer-lowest" - - php: 7.3 - env: - - DB=PGSQL - - PHPUNIT_TEST=1 - - PHPUNIT_SUITE="admin" - - php: 7.4 - env: - - DB=MYSQL - - PHPUNIT_TEST=1 - - PHPUNIT_SUITE="admin" - - php: 8.0 - env: - - DB=MYSQL - - PHPUNIT_TEST=1 - - PHPUNIT_SUITE="admin" - - COMPOSER_INSTALL_ARG="--ignore-platform-reqs" - # behat tests - - php: 7.3 - env: - - DB=MYSQL - - BEHAT_TEST=1 - - BEHAT_SUITE="admin" - - php: 7.3 - env: - - DB=MYSQL - - BEHAT_TEST=1 - - BEHAT_SUITE="cms" - - php: 7.4 - env: - - DB=MYSQL - - BEHAT_TEST=1 - - BEHAT_SUITE="asset-admin" diff --git a/README.md b/README.md index e56185c..24cbcb6 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,9 @@ ## Overview [![CI](https://github.com/silverstripe/silverstripe-installer/actions/workflows/ci.yml/badge.svg)](https://github.com/silverstripe/silverstripe-installer/actions/workflows/ci.yml) +[![Silverstripe supported module](https://img.shields.io/badge/silverstripe-supported-0071C4.svg)](https://www.silverstripe.org/software/addons/silverstripe-commercially-supported-module-list/) -Base project folder for a SilverStripe ([http://silverstripe.org](http://silverstripe.org)) installation. Required modules are installed via [http://github.com/silverstripe/recipe-cms](http://github.com/silverstripe/recipe-cms). For information on how to change the dependencies in a recipe, please have a look at [https://github.com/silverstripe/recipe-plugin](https://github.com/silverstripe/recipe-plugin). In addition, installer includes [theme/simple](https://github.com/silverstripe-themes/silverstripe-simple) as a default theme. +Base project folder for a Silverstripe ([http://silverstripe.org](http://silverstripe.org)) installation. Required modules are installed via [http://github.com/silverstripe/recipe-cms](http://github.com/silverstripe/recipe-cms). For information on how to change the dependencies in a recipe, please have a look at [https://github.com/silverstripe/recipe-plugin](https://github.com/silverstripe/recipe-plugin). In addition, installer includes [theme/simple](https://github.com/silverstripe-themes/silverstripe-simple) as a default theme. ## Installation ## @@ -18,7 +19,7 @@ Please read our [issue reporting guidelines](https://docs.silverstripe.org/en/4/ ## Development and Contribution ## -If you would like to make changes to the SilverStripe core codebase, we have an extensive [guide to contributing code](https://docs.silverstripe.org/en/4/contributing/code/). +If you would like to make changes to the Silverstripe core codebase, we have an extensive [guide to contributing code](https://docs.silverstripe.org/en/4/contributing/code/). ## Links ## diff --git a/phpunit.xml.dist b/phpunit.xml.dist index 9bcd119..7b04144 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -1,3 +1,4 @@ +