From c1256460bfeff1506b30a50c46f4d034fc3bcfc0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Morel=20Se=CC=81bastien?= Date: Mon, 10 Apr 2017 11:44:36 -0700 Subject: [PATCH] Travis Autodeploy on success and master --- .gitignore | 1 + .travis.yml | 12 ++++++------ .travis/secrets.tar.enc | Bin 0 -> 9232 bytes scripts/codechecker.bash | 4 ++-- scripts/travis_deploy.bash | 12 +++++++----- tests/Tests/RequiredFilesTest.php | 4 ++-- 6 files changed, 18 insertions(+), 15 deletions(-) create mode 100644 .travis/secrets.tar.enc diff --git a/.gitignore b/.gitignore index d25442b..3b57ca7 100644 --- a/.gitignore +++ b/.gitignore @@ -21,6 +21,7 @@ tests/coverage /.ezlaunchpad.yml # Travis stuff +/.travis/build-key.pem /.travis/ezlaunchpad-private.pem /.travis/secrets.tar diff --git a/.travis.yml b/.travis.yml index 2ef8277..0046c88 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,4 @@ sudo: false - language: php cache: @@ -10,16 +9,16 @@ cache: matrix: fast_finish: true include: - - php: 5.5 - php: 5.6 env: - EXECUTE_DEPLOYMENT=true - php: 7 - php: 7.1 - allow_failures: - - php: 5.5 + before_install: +- openssl aes-256-cbc -K $encrypted_91e9470aafb9_key -iv $encrypted_91e9470aafb9_iv -in .travis/secrets.tar.enc -out .travis/secrets.tar -d +- phpenv config-rm xdebug.ini - composer self-update install: @@ -28,8 +27,9 @@ install: script: - php vendor/bin/phpcs --standard=.cs/cs_ruleset.xml --extensions=php src/ -#- php vendor/bin/phpcs --standard=.cs/cs_ruleset.xml --extensions=php tests/Tests/ -#- php vendor/behat/behat/bin/behat +- php vendor/bin/phpcs --standard=.cs/cs_ruleset.xml --extensions=php tests/Tests/ +- php vendor/bin/phpunit -c tests/ --exclude-group behat +- php vendor/behat/behat/bin/behat -c tests/behat.yml after_success: - if [[ $EXECUTE_DEPLOYMENT == 'true' && $TRAVIS_BRANCH == 'master' && $TRAVIS_PULL_REQUEST == 'false' ]]; then composer install --no-dev ; fi diff --git a/.travis/secrets.tar.enc b/.travis/secrets.tar.enc new file mode 100644 index 0000000000000000000000000000000000000000..e844383e31c15d4c36cc55f0fb55d6488517b3be GIT binary patch literal 9232 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 literal 0 HcmV?d00001 diff --git a/scripts/codechecker.bash b/scripts/codechecker.bash index 7255eb2..d512f73 100644 --- a/scripts/codechecker.bash +++ b/scripts/codechecker.bash @@ -16,14 +16,14 @@ cd ${PROJECTDIR} echoTitle "******** Mess Detector ********" $PHP ./vendor/bin/phpmd $SRC text .cs/md_ruleset.xml -#$PHP ./vendor/bin/phpmd tests/Tests text .cs/md_ruleset.xml +$PHP ./vendor/bin/phpmd tests/Tests text .cs/md_ruleset.xml echoTitle "******** CodeFixer ************" $PHP ./vendor/bin/php-cs-fixer fix --config=.cs/.php_cs.php echoTitle "******** CodeSniffer **********" $PHP ./vendor/bin/phpcs --standard=.cs/cs_ruleset.xml --extensions=php $SRC -#$PHP ./vendor/bin/phpcs --standard=.cs/cs_ruleset.xml --extensions=php tests/Tests +$PHP ./vendor/bin/phpcs --standard=.cs/cs_ruleset.xml --extensions=php tests/Tests echoSuccess "Done." exit 0; diff --git a/scripts/travis_deploy.bash b/scripts/travis_deploy.bash index d612838..712baee 100755 --- a/scripts/travis_deploy.bash +++ b/scripts/travis_deploy.bash @@ -5,16 +5,18 @@ tar xvf .travis/secrets.tar -C .travis # Setup SSH agent: eval "$(ssh-agent -s)" #start the ssh agent -chmod 600 .travis/ezlaunchpad-private.pem -ssh-add .travis/ezlaunchpad-private.pem +chmod 600 .travis/build-key.pem +ssh-add .travis/build-key.pem # Setup git defaults: -git config --global user.email "ezlaunchpad@ez.no" -git config --global user.name "eZ Launchpad" +git config --global user.email "github-ezlaunchpad@ez.no" +git config --global user.name "eZ Launchpad Github Bot" # Add SSH-based remote to GitHub repo: git remote add deploy git@github.com:ezsystems/ezlaunchpad.git git fetch deploy +git checkout master +git status # Get box and build PHAR curl -LSs https://box-project.github.io/box2/installer.php | php @@ -30,5 +32,5 @@ git add docs/ez.phar docs/ez.phar.version # Commit and push: DATED_SUFFIX=`date +%Y-%m-%d-%H-%M-%S` -git commit -m "Deployment master on $DATED_SUFFIX" +git commit -m "[skip ci] Deployment new eZ Launchpad on $DATED_SUFFIX" git push deploy master diff --git a/tests/Tests/RequiredFilesTest.php b/tests/Tests/RequiredFilesTest.php index 66c36fc..85f17cf 100644 --- a/tests/Tests/RequiredFilesTest.php +++ b/tests/Tests/RequiredFilesTest.php @@ -16,6 +16,7 @@ class RequiredBoxFilesTest extends TestCase { const FILE = "assertFileExists"; + const DIRECTORY = "assertDirectoryExists"; /** @@ -34,7 +35,7 @@ public function getRequiredFiles() } $data[] = [$box->main, static::FILE]; - $data[] = [$box->key, static::FILE]; + $data[] = [".travis/secrets.tar", static::FILE]; return $data; } @@ -55,5 +56,4 @@ public function testBoxFileIsPresent($file, $type) $appDir = __DIR__."/../.."; $this->$type("{$appDir}/{$file}"); } - }