Skip to content

Commit 82d7658

Browse files
authored
Merge pull request #979 from jingjingxyk/experiment-feature
Experiment feature
2 parents 98989b8 + d9bff7a commit 82d7658

File tree

2 files changed

+4
-6
lines changed

2 files changed

+4
-6
lines changed

.github/workflows/macos-x86_64.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -99,8 +99,8 @@ jobs:
9999
100100
- name: prepare
101101
run: |
102-
export PATH=${{ github.workspace }}/runtime:$PATH
103-
alias php="php -d curl.cainfo=${{ github.workspace }}/runtime/cacert.pem -d openssl.cafile=${{ github.workspace }}/runtime/cacert.pem"
102+
export PATH=${{ github.workspace }}/runtime/php/:$PATH
103+
alias php="php -d curl.cainfo=${{ github.workspace }}/runtime/php/cacert.pem -d openssl.cafile=${{ github.workspace }}/runtime/php/cacert.pem"
104104
105105
composer install --no-interaction --no-autoloader --no-scripts --profile --no-dev
106106
composer dump-autoload --optimize --profile --no-dev
@@ -109,7 +109,7 @@ jobs:
109109
110110
- name: Build
111111
run: |
112-
export PATH=${{ github.workspace }}/runtime:$PATH
112+
export PATH=${{ github.workspace }}/runtime/php/:$PATH
113113
114114
bash make-install-deps.sh
115115

sapi/src/builder/extension/swoole.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,10 @@
44
use SwooleCli\Extension;
55

66
return function (Preprocessor $p) {
7-
$file = new SplFileObject($p->getWorkDir() . '/sapi/SWOOLE-VERSION.conf');
8-
7+
$file = new SplFileObject(realpath(__DIR__ . '/../../../../sapi/SWOOLE-VERSION.conf'));
98
$swoole_tag = trim($file->current());
109
// $swoole_tag = 'v6.0.1';
1110
$file = "swoole-{$swoole_tag}.tar.gz";
12-
1311
$url = "https://github.com/swoole/swoole-src/archive/refs/tags/{$swoole_tag}.tar.gz";
1412

1513
$options = [];

0 commit comments

Comments
 (0)