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.

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

Use upstream version of testing framework again #716

Merged
merged 1 commit into from Jun 17, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 2 additions & 6 deletions .travis.yml
Expand Up @@ -27,12 +27,9 @@ notifications:

# This is executed for all stages
before_install:
- mkdir -p .Build/external
- git clone https://github.com/helhum/TYPO3-testing-framework.git .Build/external/nimut-testing-framework -b typo3-93-compat
- composer config repositories.testing-framework vcs .Build/external/nimut-testing-framework
- if php -i | grep -q xdebug; then phpenv config-rm xdebug.ini; fi

install:
- if php -i | grep -q xdebug; then phpenv config-rm xdebug.ini; fi
- export COMPOSER_ROOT_VERSION=5.3.2
- |
composer require \
Expand Down Expand Up @@ -66,7 +63,6 @@ jobs:
stage: test
php: 7.2
env: PHP Lint
before_install: skip
install: skip
before_script: skip
script:
Expand Down Expand Up @@ -104,7 +100,6 @@ jobs:
- stage: test
php: 7.1
env: Consistency checks
before_install: skip
install: skip
before_script: skip
script:
Expand All @@ -118,6 +113,7 @@ jobs:
- stage: sonar code scanner
if: type = push AND branch IN (master, develop)
php: 7.2
before_install: skip
install: skip
before_script:
script:
Expand Down
4 changes: 0 additions & 4 deletions appveyor.yml
Expand Up @@ -50,10 +50,6 @@ install:
- IF NOT EXIST php-installed.txt type nul >> php-installed.txt

- cd c:\t3c
- md .Build
- md .Build\external
- git clone https://github.com/helhum/TYPO3-testing-framework.git .Build/external/nimut-testing-framework -b typo3-93-compat
- composer config repositories.testing-framework vcs .Build/external/nimut-testing-framework
- composer require "typo3/cms-backend=%TYPO3_VERSION%" "typo3/cms-core=%TYPO3_VERSION%" "typo3/cms-extbase=%TYPO3_VERSION%" "typo3/cms-extensionmanager=%TYPO3_VERSION%" "typo3/cms-fluid=%TYPO3_VERSION%" "typo3/cms-frontend=%TYPO3_VERSION%" "typo3/cms-install=%TYPO3_VERSION%" "typo3/cms-saltedpasswords=%TYPO3_VERSION%" "typo3/cms-scheduler=%TYPO3_VERSION%" --prefer-dist --no-progress --ansi
- git checkout .

Expand Down
6 changes: 1 addition & 5 deletions composer.json
Expand Up @@ -3,10 +3,6 @@
"local": {
"type": "path",
"url": "Packages/*"
},
"testing-framework": {
"type": "vcs",
"url": "https://github.com/helhum/TYPO3-testing-framework.git"
}
},
"name": "helhum/typo3-console",
Expand Down Expand Up @@ -57,7 +53,7 @@
"typo3-console/php-server-command": "^0.2",
"typo3-console/create-reference-command": "@dev",
"symfony/filesystem": "^3.2",
"nimut/testing-framework": "dev-typo3-93-compat"
"nimut/testing-framework": "dev-master"
},
"conflict": {
"typo3-ter/dbal": "*",
Expand Down