Merge branch 'stable'

This commit is contained in:
Dylan K. Taylor 2020-02-02 16:47:19 +00:00
commit afeb9838e4
3 changed files with 22 additions and 10 deletions

View File

@ -6,6 +6,7 @@ php:
- 7.3
before_script:
- phpenv config-rm xdebug.ini
- LEVELDB_VERSION=f1463cb0b2486b0caf7d42ca3c7684545e875f04
- curl -fsSL "https://github.com/pmmp/leveldb-mcpe/archive/f1463cb0b2486b0caf7d42ca3c7684545e875f04.tar.gz" | tar -zx
- mv leveldb-mcpe-$LEVELDB_VERSION leveldb-mcpe

View File

@ -104,14 +104,9 @@ function buildPhar(string $pharPath, string $basePath, array $includedPaths, arr
yield "Added $count files";
if($compression !== null){
yield "Checking for compressible files...";
foreach($phar as $file => $finfo){
/** @var \PharFileInfo $finfo */
if($finfo->getSize() > (1024 * 512)){
yield "Compressing " . $finfo->getFilename();
$finfo->compress($compression);
}
}
yield "Compressing files...";
$phar->compressFiles($compression);
yield "Finished compression";
}
$phar->stopBuffering();
@ -138,7 +133,23 @@ function main() : void{
[
'git' => $gitHash
],
'<?php require("phar://" . __FILE__ . "/src/PocketMine.php"); __HALT_COMPILER();'
<<<'STUB'
<?php
$tmpDir = sys_get_temp_dir();
if(!is_readable($tmpDir) or !is_writable($tmpDir)){
echo "ERROR: tmpdir $tmpDir is not accessible." . PHP_EOL;
echo "Check that the directory exists, and that the current user has read/write permissions for it." . PHP_EOL;
echo "Alternatively, set 'sys_temp_dir' to a different directory in your php.ini file." . PHP_EOL;
exit(1);
}
require("phar://" . __FILE__ . "/src/PocketMine.php");
__HALT_COMPILER();
STUB
,
\Phar::SHA1,
\Phar::GZ
) as $line){
echo $line . PHP_EOL;
}

@ -1 +1 @@
Subproject commit 39b3e6f288a084124f557801ec33432a96bb9f3d
Subproject commit beb079c256eea7cae0f68f02e2b61096ddc00690