Skip to content

Commit 98989b8

Browse files
authored
Merge pull request #978 from jingjingxyk/experiment-feature
Experiment feature
2 parents f03c61b + 431047f commit 98989b8

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

.github/workflows/auto-cache-pool-tarball.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,13 +72,13 @@ jobs:
7272
mkdir -p pool/lib
7373
mkdir -p pool/ext
7474
mkdir -p runtime/
75-
if [ ! -f runtime/php ] ; then
75+
if [ ! -f runtime/php/php ] ; then
7676
bash setup-php-runtime.sh
7777
fi
7878
7979
WORK_DIR=${{ github.workspace }}
80-
export PATH=${WORK_DIR}/runtime/:$PATH
81-
alias php="php -d curl.cainfo=${WORK_DIR}/runtime/cacert.pem -d openssl.cafile=${WORK_DIR}/runtime/cacert.pem"
80+
export PATH=${WORK_DIR}/runtime/php/:$PATH
81+
alias php="php -d curl.cainfo=${WORK_DIR}/runtime/php/cacert.pem -d openssl.cafile=${WORK_DIR}/runtime/php/cacert.pem"
8282
8383
composer install --no-interaction --no-autoloader --no-scripts --profile --no-dev
8484
composer dump-autoload --optimize --profile --no-dev

sapi/src/builder/extension/swoole.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
return function (Preprocessor $p) {
77
$file = new SplFileObject($p->getWorkDir() . '/sapi/SWOOLE-VERSION.conf');
88

9-
$swoole_tag = $file->current();
9+
$swoole_tag = trim($file->current());
1010
// $swoole_tag = 'v6.0.1';
1111
$file = "swoole-{$swoole_tag}.tar.gz";
1212

0 commit comments

Comments
 (0)