Skip to content

Add NTS support #24

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: default
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -41,7 +41,7 @@ matrix:

env:
global:
- VERSION=master ALIAS=nightly
- VERSION=master ALIAS=nightly ZTS=enable
- ICU_RELEASE=59.1
- ICU_INSTALL_DIR=$HOME/.phpenv/versions/$VERSION
- PATH="$HOME/.phpenv/bin:$HOME/.php-build/bin:$PATH"
@@ -70,6 +70,10 @@ install:
else
cp default_configure_options.$RELEASE $HOME/.php-build/share/php-build/default_configure_options
fi
- | # support non-thread-safe builds
if [[ $ZTS != enable ]]; then
sed -i -e '/--enable-maintainer-zts/d' $HOME/.php-build/share/php-build/default_configure_options
fi
- | # disable xdebug on master
if [[ $VERSION = master && $RELEASE != xenial ]]; then
sed -i -e '/install_xdebug_master/d' $HOME/.php-build/share/php-build/definitions/$VERSION
17 changes: 13 additions & 4 deletions bin/archive
Original file line number Diff line number Diff line change
@@ -12,25 +12,34 @@ if [[ ! $VERSION ]] ; then
exit 1
fi

if [[ ! $ZTS ]] ; then
echo 'Missing $ZTS'
exit 1
fi

set -o xtrace

: ${TAR_PATHS:=$HOME/.pearrc}
: ${DESTS:=}

if [[ $ZTS != enable ]] ; then
NTS="-nts"
fi

if [[ $VERSION =~ ^(php|hhvm) ]] ; then
DEST_VERSION="${VERSION}"
DEST_VERSION="${VERSION}${NTS}"
else
DEST_VERSION="php-${VERSION}"
DEST_VERSION="php-${VERSION}${NTS}"
fi

TAR_PATHS="$TAR_PATHS $INSTALL_DEST/$VERSION"
DESTS="$TRAVIS_BUILD_DIR/$LSB_RELEASE/${DEST_VERSION}.tar.bz2"

if [[ $ALIAS ]] ; then
if [[ $ALIAS =~ ^php|hhvm ]] ; then
LONG_ALIAS="${ALIAS}"
LONG_ALIAS="${ALIAS}${NTS}"
else
LONG_ALIAS="php-${ALIAS}"
LONG_ALIAS="php-${ALIAS}${NTS}"
fi
TAR_PATHS="$TAR_PATHS $INSTALL_DEST/$ALIAS"
DESTS="$DESTS $TRAVIS_BUILD_DIR/$LSB_RELEASE/${LONG_ALIAS}.tar.bz2"