Skip to content

Commit 9f45786

Browse files
authored
Fix/php source link (#81)
* fix(build): switch PHP source from php.net to GitHub * chore(build): bump PHP version to 8.4.18
1 parent d42d0e3 commit 9f45786

File tree

7 files changed

+15
-15
lines changed

7 files changed

+15
-15
lines changed

.github/workflows/release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ on:
1313
env:
1414
APP_NAME: 'manticore-executor'
1515
DOCKER_TAG: 'manticoresearch/manticore-executor'
16-
PHP_VERSION: '8.4.17'
16+
PHP_VERSION: '8.4.18'
1717
MAINTAINER: 'Manticore'
1818
DESC: 'Custom built PHP executor for Manticore.'
1919
EXTRA_NAME: 'manticore-extra'
@@ -927,4 +927,4 @@ jobs:
927927
with:
928928
name: executor
929929
version: "${{ needs.pack.outputs.version_full }}"
930-
token: ${{ secrets.PR_TOKEN }}
930+
token: ${{ secrets.PR_TOKEN }}

.github/workflows/test.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77

88
env:
99
APP_NAME: 'manticore-executor'
10-
PHP_VERSION: '8.4.17'
10+
PHP_VERSION: '8.4.18'
1111
MAINTAINER: 'Manticore'
1212
DESC: 'Custom built PHP executor for Manticore.'
1313

@@ -81,4 +81,4 @@ jobs:
8181
name: artifact-${{ matrix.build_type }}-${{ matrix.arch }}
8282
path: |
8383
dist/*.tar.gz
84-
dist/*.zip
84+
dist/*.zip

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ ARG BUILD_DEV=0
55
COPY . /src
66
RUN apk add bash && \
77
cd /src && \
8-
./build-alpine 8.4.17 0 $BUILD_DEV && \
8+
./build-alpine 8.4.18 0 $BUILD_DEV && \
99
mv build/dist/bin/php /usr/bin/manticore-executor && \
1010
ln -s /usr/bin/manticore-executor /usr/bin/php && \
1111
cd ../..

Dockerfile-dist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ RUN apt-get update -y && \
66
COPY ./build-linux ./build-linux
77
COPY ./build-bash-base.sh ./build-bash-base.sh
88
COPY ./helper.sh ./helper.sh
9-
RUN ./build-linux 8.4.17 0 0 && \
9+
RUN ./build-linux 8.4.18 0 0 && \
1010
cp build/dist/bin/php /usr/bin/manticore-executor && \
1111
rm -fr build
1212

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ Manticore Executor is a custom built PHP binary which:
2828

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

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

3333
* pcntl
3434
* posix
@@ -84,10 +84,10 @@ Several scripts used to build the final package:
8484
* `build-linux`
8585
* `build-osx`
8686

87-
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:
87+
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:
8888

8989
```bash
90-
./build-linux "8.4.17"
90+
./build-linux "8.4.18"
9191
```
9292

93-
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`.
93+
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`.

build-bash-base.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@ if [[ -z "$SKIP_SYSTEM_DEPS" || "$SKIP_SYSTEM_DEPS" == 0 ]]; then
3333
fi
3434

3535

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

4040
# Build extra extensions
4141
cd ext
@@ -118,7 +118,7 @@ if [[ "$BUILD_DEV" == "1" ]]; then
118118
# "--enable-memprof"
119119
# "--enable-memprof-debug"
120120
#
121-
# It does not work with PHP 8.4.17
121+
# It does not work with PHP 8.4.18
122122
# "--enable-tideways-xhprof"
123123
# "--enable-xdebug"
124124
)
@@ -129,4 +129,4 @@ mkdir dist
129129
./buildconf --force
130130
BUILD_PREFIX="$(pwd)/dist"
131131

132-
export BUILD_EXTRA BUILD_PREFIX BUILD_STATIC
132+
export BUILD_EXTRA BUILD_PREFIX BUILD_STATIC

helper.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ build_dev_conf() {
7171
git checkout 68eb143bd5700a6fe041826118aeb9a13a3fcef3
7272
cd ..
7373

74-
# It does not work with PHP 8.4.17
74+
# It does not work with PHP 8.4.18
7575
# git clone https://github.com/tideways/php-xhprof-extension.git tideways_xhprof && cd "$_"
7676
# git checkout 7877082945fcccced12676749676af1736a00f65
7777
# cd ..

0 commit comments

Comments
 (0)