Compare commits

...

6 Commits

Author SHA1 Message Date
crazywhalecc
57b3db4814 add retry for CI test download 2024-04-19 23:57:33 +08:00
crazywhalecc
2b246fab7c test intl 2024-04-19 23:53:58 +08:00
crazywhalecc
345353b57a test intl 2024-04-19 23:32:46 +08:00
Kévin Dunglas
6478950057 hack CXX env var to force C++17 2024-04-19 15:38:40 +02:00
Kévin Dunglas
958ebcd9f8 wip 2024-04-19 14:02:09 +02:00
Kévin Dunglas
354e2d0664 fix: use C++ 17 compiler for ICU 2024-04-19 10:02:16 +02:00
5 changed files with 7 additions and 3 deletions

View File

@@ -165,7 +165,7 @@ jobs:
max_attempts: 3 max_attempts: 3
retry_on: error retry_on: error
command: | command: |
bin/spc download --for-extensions="$(php src/globals/test-extensions.php extensions)" --for-libs="$(php src/globals/test-extensions.php libs)" --with-php=${{ matrix.php }} --ignore-cache-sources=php-src --debug bin/spc download --for-extensions="$(php src/globals/test-extensions.php extensions)" --for-libs="$(php src/globals/test-extensions.php libs)" --with-php=${{ matrix.php }} --ignore-cache-sources=php-src --debug --retry=3
- name: "Run Build Tests (build)" - name: "Run Build Tests (build)"
run: bin/spc build "$(php src/globals/test-extensions.php extensions)" --with-libs="$(php src/globals/test-extensions.php libs)" --build-cli --build-micro --build-fpm --debug run: bin/spc build "$(php src/globals/test-extensions.php extensions)" --with-libs="$(php src/globals/test-extensions.php libs)" --build-cli --build-micro --build-fpm --debug

View File

@@ -142,6 +142,8 @@ class LinuxBuilder extends UnixBuilderBase
'CPPFLAGS' => getenv('SPC_CMD_VAR_PHP_CONFIGURE_CPPFLAGS'), 'CPPFLAGS' => getenv('SPC_CMD_VAR_PHP_CONFIGURE_CPPFLAGS'),
'LDFLAGS' => getenv('SPC_CMD_VAR_PHP_CONFIGURE_LDFLAGS'), 'LDFLAGS' => getenv('SPC_CMD_VAR_PHP_CONFIGURE_LDFLAGS'),
'LIBS' => getenv('SPC_CMD_VAR_PHP_CONFIGURE_LIBS'), 'LIBS' => getenv('SPC_CMD_VAR_PHP_CONFIGURE_LIBS'),
// TODO: remove the following line when https://github.com/php/php-src/pull/14002 will be released
'CXX' => 'g++ -std=c++17',
]); ]);
// upx pack and strip for micro // upx pack and strip for micro

View File

@@ -11,7 +11,7 @@ class icu extends LinuxLibraryBase
protected function build(): void protected function build(): void
{ {
$cppflags = 'CPPFLAGS="-DU_CHARSET_IS_UTF8=1 -DU_USING_ICU_NAMESPACE=1 -DU_STATIC_IMPLEMENTATION=1"'; $cppflags = 'CPPFLAGS="-DU_CHARSET_IS_UTF8=1 -DU_USING_ICU_NAMESPACE=1 -DU_STATIC_IMPLEMENTATION=1"';
$cxxflags = 'CXXFLAGS="-std=c++11"'; $cxxflags = 'CXXFLAGS="-std=c++17"';
$ldflags = 'LDFLAGS="-static"'; $ldflags = 'LDFLAGS="-static"';
shell()->cd($this->source_dir . '/source') shell()->cd($this->source_dir . '/source')
->exec( ->exec(

View File

@@ -147,6 +147,8 @@ class MacOSBuilder extends UnixBuilderBase
'CFLAGS' => getenv('SPC_CMD_VAR_PHP_CONFIGURE_CFLAGS'), 'CFLAGS' => getenv('SPC_CMD_VAR_PHP_CONFIGURE_CFLAGS'),
'CPPFLAGS' => getenv('SPC_CMD_VAR_PHP_CONFIGURE_CPPFLAGS'), 'CPPFLAGS' => getenv('SPC_CMD_VAR_PHP_CONFIGURE_CPPFLAGS'),
'LDFLAGS' => getenv('SPC_CMD_VAR_PHP_CONFIGURE_LDFLAGS'), 'LDFLAGS' => getenv('SPC_CMD_VAR_PHP_CONFIGURE_LDFLAGS'),
// TODO: remove the following line when https://github.com/php/php-src/pull/14002 will be released
'CXX' => 'g++ -std=c++17',
]); ]);
if ($this->getLib('postgresql')) { if ($this->getLib('postgresql')) {

View File

@@ -13,7 +13,7 @@ declare(strict_types=1);
// If you want to test your added extensions and libs, add below (comma separated, example `bcmath,openssl`). // If you want to test your added extensions and libs, add below (comma separated, example `bcmath,openssl`).
$extensions = match (PHP_OS_FAMILY) { $extensions = match (PHP_OS_FAMILY) {
'Linux', 'Darwin' => 'uuid', 'Linux', 'Darwin' => 'intl,posix',
'Windows' => 'mbstring,pdo_sqlite,mbregex', 'Windows' => 'mbstring,pdo_sqlite,mbregex',
}; };