Skip to content
Merged
Show file tree
Hide file tree
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
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ on:
env:
APP_NAME: 'manticore-executor'
DOCKER_TAG: 'manticoresearch/manticore-executor'
PHP_VERSION: '8.4.17'
PHP_VERSION: '8.4.18'
MAINTAINER: 'Manticore'
DESC: 'Custom built PHP executor for Manticore.'
EXTRA_NAME: 'manticore-extra'
Expand Down Expand Up @@ -927,4 +927,4 @@ jobs:
with:
name: executor
version: "${{ needs.pack.outputs.version_full }}"
token: ${{ secrets.PR_TOKEN }}
token: ${{ secrets.PR_TOKEN }}
4 changes: 2 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:

env:
APP_NAME: 'manticore-executor'
PHP_VERSION: '8.4.17'
PHP_VERSION: '8.4.18'
MAINTAINER: 'Manticore'
DESC: 'Custom built PHP executor for Manticore.'

Expand Down Expand Up @@ -81,4 +81,4 @@ jobs:
name: artifact-${{ matrix.build_type }}-${{ matrix.arch }}
path: |
dist/*.tar.gz
dist/*.zip
dist/*.zip
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ ARG BUILD_DEV=0
COPY . /src
RUN apk add bash && \
cd /src && \
./build-alpine 8.4.17 0 $BUILD_DEV && \
./build-alpine 8.4.18 0 $BUILD_DEV && \
mv build/dist/bin/php /usr/bin/manticore-executor && \
ln -s /usr/bin/manticore-executor /usr/bin/php && \
cd ../..
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile-dist
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ RUN apt-get update -y && \
COPY ./build-linux ./build-linux
COPY ./build-bash-base.sh ./build-bash-base.sh
COPY ./helper.sh ./helper.sh
RUN ./build-linux 8.4.17 0 0 && \
RUN ./build-linux 8.4.18 0 0 && \
cp build/dist/bin/php /usr/bin/manticore-executor && \
rm -fr build

Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ Manticore Executor is a custom built PHP binary which:

By default, we disable all extensions and enable only those required to run our scripts.

We build executor from `PHP 8.4.17` with the following extensions enabled and compiled into the executable statically:
We build executor from `PHP 8.4.18` with the following extensions enabled and compiled into the executable statically:

* pcntl
* posix
Expand Down Expand Up @@ -84,10 +84,10 @@ Several scripts used to build the final package:
* `build-linux`
* `build-osx`

The scripts accept a version of PHP as a parameter. The current version is `8.4.17`. To build the binary, you should run the following example:
The scripts accept a version of PHP as a parameter. The current version is `8.4.18`. To build the binary, you should run the following example:

```bash
./build-linux "8.4.17"
./build-linux "8.4.18"
```

The command above will build the package on Linux with **PHP** `8.4.17`. Once it's done, you can find your binary in folder `dist/bin`.
The command above will build the package on Linux with **PHP** `8.4.18`. Once it's done, you can find your binary in folder `dist/bin`.
8 changes: 4 additions & 4 deletions build-bash-base.sh
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@ if [[ -z "$SKIP_SYSTEM_DEPS" || "$SKIP_SYSTEM_DEPS" == 0 ]]; then
fi


curl -sSL "https://www.php.net/distributions/php-${PHP_VERSION}.tar.gz" | tar -xzf -
curl -sSL "https://github.com/php/php-src/archive/refs/tags/php-${PHP_VERSION}.tar.gz" | tar -xzf -
test -d build && rm -fr "$_"
mv "php-$PHP_VERSION" build && cd "$_"
mv "php-src-php-$PHP_VERSION" build && cd "$_"

# Build extra extensions
cd ext
Expand Down Expand Up @@ -118,7 +118,7 @@ if [[ "$BUILD_DEV" == "1" ]]; then
# "--enable-memprof"
# "--enable-memprof-debug"
#
# It does not work with PHP 8.4.17
# It does not work with PHP 8.4.18
# "--enable-tideways-xhprof"
# "--enable-xdebug"
)
Expand All @@ -129,4 +129,4 @@ mkdir dist
./buildconf --force
BUILD_PREFIX="$(pwd)/dist"

export BUILD_EXTRA BUILD_PREFIX BUILD_STATIC
export BUILD_EXTRA BUILD_PREFIX BUILD_STATIC
2 changes: 1 addition & 1 deletion helper.sh
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ build_dev_conf() {
git checkout 68eb143bd5700a6fe041826118aeb9a13a3fcef3
cd ..

# It does not work with PHP 8.4.17
# It does not work with PHP 8.4.18
# git clone https://github.com/tideways/php-xhprof-extension.git tideways_xhprof && cd "$_"
# git checkout 7877082945fcccced12676749676af1736a00f65
# cd ..
Expand Down
Loading