Skip to content

Commit

Permalink
Merge pull request pantheon-systems#23 from lsolesen/upgrade-dependency
Browse files Browse the repository at this point in the history
Issue #2230029: Updating from previous Kickstart versions is broken
  • Loading branch information
bojanz committed Apr 1, 2014
2 parents 6d40cff + ffe4502 commit a8d8cdb
Show file tree
Hide file tree
Showing 2 changed files with 39 additions and 5 deletions.
11 changes: 8 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,27 +14,32 @@ mysql:

env:
- UPGRADE=none
- UPGRADE=7.x-2.13
- UPGRADE=7.x-2.12
- UPGRADE=7.x-2.11
- UPGRADE=7.x-2.10
- UPGRADE=7.x-2.9
- UPGRADE=7.x-2.8
- UPGRADE=7.x-2.7
- UPGRADE=7.x-2.6
- UPGRADE=7.x-2.5
- UPGRADE=7.x-2.4
- UPGRADE=7.x-2.3
- UPGRADE=7.x-2.2
- UPGRADE=7.x-2.1
- UPGRADE=7.x-2.0
- UPGRADE=7.x-2.0-rc1

install:
- sudo apt-get update > /dev/null
- "mysql -e 'create database drupal;'"

# Install latest Drush 6.
- export PATH="$HOME/.composer/vendor/bin:$PATH"
- composer global require --no-interaction drush/drush:6.*
- composer global require --no-interaction --prefer-source drush/drush:6.*

# Build Behat dependencies
- cd ./tests/behat
- composer install --no-interaction
- composer install --no-interaction --prefer-source
- cd ../../../

# Build Codebase
Expand Down
33 changes: 31 additions & 2 deletions commerce_kickstart.install
Original file line number Diff line number Diff line change
Expand Up @@ -706,8 +706,37 @@ function _commerce_kickstart_disable_modules($modules) {
->execute();
}

function commerce_kickstart_update_7100() {
registry_rebuild();
/**
* Implements hook_update_dependencies().
*/
function commerce_kickstart_update_dependencies() {
$deps = array();
$deps['commerce_kickstart'][7200] = array(
'rules' => 7210,
'rules' => 7211,
'rules' => 7212,
'rules' => 7213,
);
$deps['commerce_kickstart'][7212] = array(
'rules' => 7210,
'rules' => 7211,
'rules' => 7212,
'rules' => 7213,
);
$deps['commerce_kickstart'][7213] = array(
'commerce_discount' => 7101,
'commerce_discount' => 7102,
);
$deps['commerce_kickstart'][7214] = array(
'rules' => 7210,
'rules' => 7211,
'rules' => 7212,
'rules' => 7213,
);
$deps['commerce_kickstart'][7219] = array(
'commerce_discount' => 7104,
);
return $deps;
}

/**
Expand Down

0 comments on commit a8d8cdb

Please sign in to comment.