Skip to content

Commit f4559a6

Browse files
Merge pull request #32 from mrrobot47/refactor-db-code
Refactor db code
2 parents edf1f0d + 6c155e8 commit f4559a6

File tree

2 files changed

+151
-185
lines changed

2 files changed

+151
-185
lines changed

ci/prepare.sh

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,16 @@ cd easyengine
1515
rm -r features
1616
cp -R ../$TEST_COMMAND/features .
1717

18+
# Update repo branches
19+
if [[ "$TRAVIS_BRANCH" != "master" ]]; then
20+
sed -i 's/\(easyengine\/.*\):\ \".*\"/\1:\ \"dev-develop\"/' composer.json
21+
fi
22+
1823
# Install composer dependencies and update them for tests
1924
composer update
2025

2126
# Place the command inside EE repo
22-
sudo rm -r vendor/easyengine/$TEST_COMMAND
27+
sudo rm -rf vendor/easyengine/$TEST_COMMAND
2328
cp -R ../$TEST_COMMAND vendor/easyengine/
2429

2530
# Create phar and test it

0 commit comments

Comments
 (0)