Skip to content
Permalink
Browse files

Merge pull request #13876 from phalcon/4.0.x

4.0.0-alpha.3
  • Loading branch information...
sergeyklay committed Mar 3, 2019
2 parents 171b6cd + 478e7da commit 9fae862af1f2685872f9f2d1ed2489eff7e9c535
Showing 519 changed files with 158,911 additions and 88,808 deletions.
@@ -43,15 +43,15 @@ function InitializeBuildVars {

function InitializeReleaseVars {
if ($Env:BUILD_TYPE -Match "nts-Win32") {
$Env:RELEASE_ZIPBALL = "phalcon_${Env:PLATFORM}_vc${Env:VC_VERSION}_php${Env:PHP_MINOR}_${Env:APPVEYOR_BUILD_VERSION}_nts"
$Env:RELEASE_ZIPBALL = "phalcon_${Env:PLATFORM}_vc${Env:VC_VERSION}_php${Env:PHP_VERSION}_${Env:APPVEYOR_BUILD_VERSION}_nts"

if ($Env:PLATFORM -eq 'x86') {
$Env:RELEASE_FOLDER = "Release"
} else {
$Env:RELEASE_FOLDER = "x64\Release"
}
} else {
$Env:RELEASE_ZIPBALL = "phalcon_${Env:PLATFORM}_vc${Env:VC_VERSION}_php${Env:PHP_MINOR}_${Env:APPVEYOR_BUILD_VERSION}"
$Env:RELEASE_ZIPBALL = "phalcon_${Env:PLATFORM}_vc${Env:VC_VERSION}_php${Env:PHP_VERSION}_${Env:APPVEYOR_BUILD_VERSION}"

if ($Env:PLATFORM -eq 'x86') {
$Env:RELEASE_FOLDER = "Release_TS"
@@ -0,0 +1,23 @@
#!/usr/bin/env bash
#
# This file is part of the Phalcon Framework.
#
# (c) Phalcon Team <team@phalconphp.com>
#
# For the full copyright and license information, please view the
# LICENSE.txt file that was distributed with this source code.

# Ensure that this is being run inside a CI container
if [ "${CI}" != "true" ];
then
>&2 echo "This script is designed to run inside a CI container only."
>&2 echo "Aborting."
exit 1
fi

echo mysql-apt-config mysql-apt-config/select-server select mysql-5.7 | sudo debconf-set-selections
wget https://dev.mysql.com/get/mysql-apt-config_0.7.3-1_all.deb
sudo dpkg --install mysql-apt-config_0.7.3-1_all.deb
sudo apt-get update -q
sudo apt-get install -q -y --allow-unauthenticated -o Dpkg::Options::=--force-confnew mysql-server
sudo mysql_upgrade
@@ -1,43 +1,22 @@
# EditorConfig is awesome: http://EditorConfig.org

root = true
charset = utf-8
trim_trailing_whitespace = true
# top-most EditorConfig file
root = true

[*]
end_of_line = lf
insert_final_newline = true
indent_style = space
indent_size = 4

[*.{c,h,awk,w32,bat,mk,Makefile,frag,zep,lemon,re,psm1,sh}]
charset = utf-8
end_of_line = lf
indent_size = 4
indent_style = tab
tab_width = 4
trim_trailing_whitespace = true
insert_final_newline = true

[*.{yml,m4,json,xml}]
charset = utf-8
end_of_line = lf
indent_size = 2
indent_style = space
trim_trailing_whitespace = true
insert_final_newline = true
[*.{c,h,awk,w32,bat,mk,Makefile,frag,zep,lemon,re,psm1,sh}]
indent_style = tab
tab_width = 4

[*.{php,phpt}]
charset = utf-8
end_of_line = lf
indent_size = 4
indent_style = space
trim_trailing_whitespace = true
insert_final_newline = true
[*.{yml,m4,json,xml}]
indent_size = 2

[*.md]
charset = utf-8
end_of_line = lf
indent_style = space
trim_trailing_whitespace = false
insert_final_newline = true
@@ -3,11 +3,12 @@ Hello!
* Type: bug fix | new feature | code quality | documentation
* Link to issue:

**In raising this pull request, I confirm the following (please check boxes):**
**In raising this pull request, I confirm the following:**

- [ ] I have read and understood the [Contributing Guidelines](https://github.com/phalcon/cphalcon/blob/master/CONTRIBUTING.md)?
- [ ] I have checked that another pull request for this purpose does not exist.
- [ ] I wrote some tests for this PR.
- [ ] I have read and understood the [Contributing Guidelines](https://github.com/phalcon/cphalcon/blob/master/CONTRIBUTING.md)
- [ ] I have checked that another pull request for this purpose does not exist
- [ ] I wrote some tests for this PR
- [ ] I updated the CHANGELOG

Small description of change:

@@ -49,6 +49,7 @@ autom4te.cache/
/ide/

.zephir/
zephir.phar

boxfile.yml
composer.lock
@@ -2,7 +2,7 @@ sudo: false

language: php
php:
# PHP 7.4 does not ready yet
# PHP 7.4 is not ready yet
# - 'master'
- '7.3'
- '7.2'
@@ -18,19 +18,15 @@ branches:

addons:
apt:
sources:
- mysql-5.7-trusty
packages:
- beanstalkd
- gdb
- lcov
- mysql-server
- mysql-client
postgresql: "9.4"

matrix:
fast_finish: true
# PHP 7.4 does not ready yet
# PHP 7.4 is not ready yet
# allow_failures:
# - php: 'master'

@@ -86,6 +82,7 @@ before_install:
export PHP_PEAR_PHP_BIN=$(phpenv which php)
install:
- .ci/install-mysql-5.7.sh
- tests/_ci/setup-dbs.sh
- tests/_ci/pear-setup.sh
- .ci/install-prereqs.sh
Oops, something went wrong.

0 comments on commit 9fae862

Please sign in to comment.
You can’t perform that action at this time.
You signed in with another tab or window. Reload to refresh your session. You signed out in another tab or window. Reload to refresh your session.