Skip to content
This repository has been archived by the owner on Aug 25, 2022. It is now read-only.

Commit

Permalink
Issue #17: Fix dependecies as the module is external now.
Browse files Browse the repository at this point in the history
  • Loading branch information
claudiu-cristea committed May 16, 2019
1 parent bda0145 commit bd9b7f5
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 19 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@ before_install:
# Deploy the codebase.
- test ${TEST} == "PHP_CodeSniffer" || cp ${TRAVIS_BUILD_DIR}/tests/travis-ci/fixtures/composer.json.dist ${SITE_DIR}/composer.json
- test ${TEST} == "PHP_CodeSniffer" || cp ${TRAVIS_BUILD_DIR}/tests/travis-ci/fixtures/phpunit.xml.dist ${SITE_DIR}/web/phpunit.xml
- test ${TEST} == "PHP_CodeSniffer" || sed -i -e 's#\$TRAVIS_BUILD_DIR#'${TRAVIS_BUILD_DIR}'#g' composer.json
- test ${TEST} == "PHP_CodeSniffer" || composer require drupal/core:$TEST --no-interaction
- test ${TEST} == "PHP_CodeSniffer" || perl -i -pe's/\$\{([^}]+)\}/$ENV{$1}/' composer.json
- test ${TEST} == "PHP_CodeSniffer" || composer require drupal/core:${TEST} --no-interaction
# Virtuoso setup.
- test ${TEST} == "PHP_CodeSniffer" || mkdir ${SITE_DIR}/virtuoso
- test ${TEST} == "PHP_CodeSniffer" || docker run --name virtuoso -p 8890:8890 -p 1111:1111 -e SPARQL_UPDATE=true -v ${SITE_DIR}/virtuoso:/data -d tenforce/virtuoso
Expand Down
15 changes: 8 additions & 7 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,19 @@
},
"license": "GPL-2.0+",
"minimum-stability": "dev",
"prefer-stable": true,
"require": {
"php": ">=7.1"
"php": ">=7.1",
"drupal/sparql_entity_storage": "^1.0"
},
"require-dev": {
"minimaxir/big-list-of-naughty-strings": "dev-master"
},
"repositories": [
{
"type": "vcs",
"url": "https://github.com/ec-europa/sparql_entity_storage.git"
},
{
"type": "composer",
"url": "https://packages.drupal.org/8"
Expand All @@ -31,10 +37,5 @@
}
}
}
],
"autoload": {
"classmap": [
"sparql_entity_storage/driver/sparql/Connection.php"
]
}
]
}
13 changes: 4 additions & 9 deletions tests/travis-ci/fixtures/composer.json.dist
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
"php": ">=7.1.0",
"composer/installers": "^1.5.0",
"drupal-composer/drupal-scaffold": "dev-master",
"drupal/core": "~8",
"drupal/rdf_entity": "*",
"drush/drush": "~9",
"easyrdf/easyrdf": "0.10.0-alpha.1 as 0.9.2",
Expand All @@ -20,11 +19,12 @@
"repositories": [
{
"type": "path",
"url": "$TRAVIS_BUILD_DIR"
"url": "${TRAVIS_BUILD_DIR}"
},
{
"type": "composer",
"url": "https://packages.drupal.org/8"
"type": "vcs",
"url": "https://github.com/ec-europa/sparql_entity_storage.git",
"no-api": true
},
{
"type": "package",
Expand All @@ -43,10 +43,5 @@
"web/core": ["type:drupal-core"],
"web/modules/{$name}": ["type:drupal-module"]
}
},
"autoload": {
"classmap": [
"web/modules/rdf_entity/sparql_entity_storage/driver/sparql/Connection.php"
]
}
}
2 changes: 1 addition & 1 deletion tests/travis-ci/scripts/run_tests
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ case "$1" in
;;
8.*.x)
cd ${SITE_DIR}/web
../vendor/bin/phpunit
../vendor/bin/phpunit --testdox --verbose
exit $?
;;
*)
Expand Down

0 comments on commit bd9b7f5

Please sign in to comment.