Skip to content

Commit

Permalink
Merge pull request #29 from sugarcrm/BR-4945/jcorley/release0dot4dot1
Browse files Browse the repository at this point in the history
Br 4945/jcorley/release0dot4dot1
  • Loading branch information
jpackagejasonc authored Jan 26, 2017
2 parents 1dd4a54 + 5418250 commit fc388cd
Show file tree
Hide file tree
Showing 4 changed files with 35 additions and 71 deletions.
38 changes: 31 additions & 7 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,15 +1,39 @@
language: php
sudo: true
sudo: yes
dist: trusty

php:
- '5.4'
- '5.5'
- '5.6'
matrix:
allow_failures:
- env: PHPVER="7.0.15"
- env: PHPVER="7.1.1"

env:
- PHPVER="5.4.29"
- PHPVER="5.5.38"
- PHPVER="5.6.30"
- PHPVER="7.0.15"
- PHPVER="7.1.1"

# This replaces the travis supplied phpbuild which defaults to ZTS enabled
# builds. Since we are replacing using the same config, we don't have to add
# the env stuff.
install:
- rm -rf ~/.phpenv
- sudo apt-get clean
- sudo apt-get update
- sudo apt-get purge --auto-remove mysql-client-5.6 mysql-client-core-5.6 mysql-server-5.6 mysql-server-core-5.6
- sudo rm -rf /var/lib/mysql
- sudo apt-get build-dep php5
- sudo apt-get install git libmcrypt-dev libreadline-dev
- curl -L http://git.io/phpenv-installer | bash
- travis_wait phpenv install "${PHPVER}"
- phpenv global "${PHPVER}"
- phpenv rehash

before_script:
- .travis/php-setup.sh
- php-config --extension-dir
- phpize
- ./configure --with-php-config=php-config
- ./configure
- make
- sed -i.stock -r -e 's/!mail_qa_team\(\$[[:alnum:]_]+,[[:space:]]*\$[[:alnum:]_]+,[[:space:]]*\$[[:alnum:]_]+\)/true/' run-tests.php
- sed -i.stock -e "s/\$ini_settings\['extension'\]\[\] = \$ext_dir \. DIRECTORY_SEPARATOR \. \$req_ext \. '\.' \. PHP_SHLIB_SUFFIX;/array_unshift\(\$ini_settings\['extension'\], \$ext_dir \. DIRECTORY_SEPARATOR \. \$req_ext \. '\.' \. PHP_SHLIB_SUFFIX\);/" run-tests.php
Expand Down
62 changes: 0 additions & 62 deletions .travis/php-setup.sh

This file was deleted.

4 changes: 3 additions & 1 deletion php-shadow.spec
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
%global php_version %(php-config --version 2>/dev/null || echo 0)

Name: php-shadow
Version: 0.4.0
Version: 0.4.1
Release: 1sugar
Summary: Shadow is a multitenancy-support module for Sugar

Expand Down Expand Up @@ -46,6 +46,8 @@ rm -rf $RPM_BUILD_ROOT
%{php_extdir}/shadow.so

%changelog
* Wed Jan 25 2017 Jason Corley <[email protected]> - 0.4.1
- bump version to 0.4.1, last release supporting PHP 5.x
* Wed Oct 5 2016 Jason Corley <[email protected]> - 0.4.0
- bump version to 0.4.0, PHP 5.6 support added
* Fri May 22 2015 Michael Gusev <[email protected]> - 0.3.12
Expand Down
2 changes: 1 addition & 1 deletion php_shadow.h
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ ZEND_END_MODULE_GLOBALS(shadow)
#define SHADOW_G(v) (shadow_globals.v)
#endif

#define SHADOW_VERSION "0.4.0"
#define SHADOW_VERSION "0.4.1"

ZEND_EXTERN_MODULE_GLOBALS(shadow)

Expand Down

0 comments on commit fc388cd

Please sign in to comment.