test ldap

symlink breaks imagemagick build

.github/workflows/release-build.yml

@@ -1,6 +1,8 @@
-name: Upload SPC Binary (Release)
+name: Build SPC Binary
 
 on:
+  push:
+    branches: [ "main" ]
   release:
     types:
       - published
@@ -8,10 +10,14 @@ on:
 
 jobs:
   build-release-artifacts:
-    name: "Upload SPC Binary (Release)"
+    name: "Build SPC Binary"
     runs-on: ubuntu-latest
     strategy:
       matrix:
+        php-version:
+          - "8.1"
+        micro-version:
+          - "8.1.26"
         operating-system:
           - "linux-x86_64"
           - "macos-x86_64"
@@ -21,18 +27,57 @@ jobs:
       - name: "Checkout"
         uses: "actions/checkout@v4"
 
-      - name: Reuse static-php-cli-hosted artifacts
-        uses: dawidd6/action-download-artifact@v2
+      - if: inputs.debug == true
+        run: echo "SPC_BUILD_DEBUG=--debug" >> $GITHUB_ENV
+
+      - name: "Install PHP for official runners"
+        uses: "shivammathur/setup-php@v2"
         with:
-          repo: static-php/static-php-cli-hosted
-          branch: master
-          workflow: build-spc-release.yml
-          name: "spc-${{ matrix.operating-system }}"
+          coverage: none
+          tools: composer:v2
+          php-version: "${{ matrix.php-version }}"
+          ini-values: memory_limit=-1
+
+      - name: "Get Composer Cache Directory"
+        id: composer-cache
+        run: |
+          echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
+
+      - name: "Cache Composer dependencies"
+        uses: "actions/cache@v3"
+        with:
+          path: "${{ steps.composer-cache.outputs.dir }}"
+          key: "php-${{ matrix.php-version }}-locked-composer-${{ hashFiles('**/composer.lock') }}"
+          restore-keys: |
+            php-${{ matrix.php-version }}-locked-composer
+
+      - name: "Install Locked Dependencies"
+        run: "composer install --no-interaction --no-progress"
+
+      - name: "Build PHAR File"
+        run: "composer build:phar"
+
+      - name: "Download minimal combination"
+        run: |
+          curl https://dl.static-php.dev/static-php-cli/minimal/php-${{ matrix.micro-version }}-micro-${{ matrix.operating-system }}.tar.gz -o tmp.tgz
+          tar -zxvf tmp.tgz
+
+      - name: "Generate Executable"
+        run: |
+          cat micro.sfx spc.phar > spc
+          chmod +x spc
 
       - name: "Archive Executable"
         run: |
           tar -czf spc-${{ matrix.operating-system }}.tar.gz spc
           echo "filename=spc-${{ matrix.operating-system }}.tar.gz" >> $GITHUB_ENV
+          echo "OS=${{ matrix.operating-system }}" >> $GITHUB_ENV
+          if [ "${{ matrix.operating-system }}" == "linux-x86_64" ]; then
+            ./spc dev:extensions
+          fi
+
+      - name: "Copy file"
+        run: "mkdir dist/ && cp ${{ env.filename }} dist/ && cp spc dist/spc-$OS"
 
       - name: upload binaries to release
         uses: softprops/action-gh-release@v1
@@ -40,6 +85,18 @@ jobs:
         with:
           files: ${{ env.filename }}
 
+      - name: "Deploy to Self-Hosted Server"
+        if: github.repository == 'crazywhalecc/static-php-cli'
+        uses: easingthemes/ssh-deploy@main
+        env:
+          SSH_PRIVATE_KEY: ${{ secrets.DEPLOY_SERVER_SECRET_KEY }}
+          ARGS: "-rltgoDzvO"
+          SOURCE: "dist/"
+          REMOTE_HOST: ${{ secrets.DEPLOY_SERVER_HOST }}
+          REMOTE_PORT: ${{ secrets.DEPLOY_SERVER_PORT }}
+          REMOTE_USER: ${{ secrets.DEPLOY_SERVER_USER }}
+          TARGET: ${{ secrets.DEPLOY_SERVER_TARGET_SPC_NIGHTLY }}
+
       - name: "Upload Artifact"
         uses: actions/upload-artifact@v3
         with:

.github/workflows/tests.yml

@@ -2,7 +2,10 @@ name: Tests
 
 on:
   push:
-    branches: [ "main" ]
+    branches:
+      - main
+    paths:
+      - 'src/globals/test-extensions.php'
   pull_request:
     branches: [ "main" ]
 
@@ -133,6 +136,13 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-php-
 
+      # Cache downloaded source
+      - id: cache-download
+        uses: actions/cache@v3
+        with:
+          path: downloads
+          key: php-${{ matrix.php }}-dependencies
+
       - name: "Install Dependencies"
         run: composer update -q --no-ansi --no-interaction --no-scripts --no-progress --prefer-dist
 

.github/workflows/update-docs-config.yml

@@ -0,0 +1,43 @@
+name: Update Docs Config
+
+on:
+  push:
+    branches:
+      - main
+    paths:
+      - 'config/**.json'
+
+jobs:
+  update-docs-config:
+    name: "Update Docs Config"
+    runs-on: ubuntu-latest
+    if: github.repository == 'crazywhalecc/static-php-cli'
+    steps:
+      - name: "Checkout static-php-cli"
+        uses: actions/checkout@v4
+        with:
+          ref: main
+          path: static-php-cli
+
+      - name: "Checkout static-php-cli-docs"
+        uses: actions/checkout@v4
+        with:
+          repository: static-php/static-php-cli-docs
+          ref: master
+          token: ${{ secrets.DOCS_REPO_TOKEN }}
+          path: static-php-cli-docs
+
+      - name: "Set up Git"
+        run: |
+          git config --global user.email "actions@github.com"
+          git config --global user.name "GitHub Actions"
+
+      - name: "Copy Config Files"
+        run: cp -r static-php-cli/config/* static-php-cli-docs/docs/.vitepress/config/
+
+      - name: "Commit and Push Changes"
+        run: |
+          cd static-php-cli-docs
+          git add -A
+          git commit -m "Sync config files from main"
+          git push origin master

config/ext.json

@@ -406,10 +406,10 @@
         "lib-depends": [
             "unixodbc"
         ],
-        "cpp-extension": true,
         "ext-depends-linux": [
             "pcntl"
-        ]
+        ],
+        "cpp-extension": true
     },
     "ssh2": {
         "type": "external",

config/lib.json

@@ -327,12 +327,12 @@
             "libxml2"
         ],
         "lib-depends": [
-            "libiconv",
-            "zlib"
+            "libiconv"
         ],
         "lib-suggests": [
             "xz",
-            "icu"
+            "icu",
+            "zlib"
         ]
     },
     "libxslt": {

config/source.json

@@ -30,7 +30,7 @@
         "regex": "/href=\"(?<file>bzip2-(?<version>[^\"]+)\\.tar\\.gz)\"/",
         "license": {
             "type": "text",
-            "text": "This program, \"bzip2\", the associated library \"libbzip2\", and all documentation, are copyright (C) 1996-2010 Julian R Seward. All rights reserved.\n\nRedistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:\n\n    1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.\n    2. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.\n    3. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.\n    4. The name of the author may not be used to endorse or promote products derived from this software without specific prior written permission.\n\nTHIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n\nJulian Seward, jseward@bzip.org bzip2/libbzip2 version 1.0.6 of 6 September 2010\n\nPATENTS: To the best of my knowledge, bzip2 and libbzip2 do not use any patented algorithms. However, I do not have the resources to carry out a patent search. Therefore I cannot give any guarantee of the above statement."
+            "text": "This program, \"bzip2\", the associated library \"libbzip2\", and all documentation, are copyright (C) 1996-2010 Julian R Seward. All rights reserved. \n\nRedistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:\n\n    1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.\n    2. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.\n    3. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.\n    4. The name of the author may not be used to endorse or promote products derived from this software without specific prior written permission.\n\nTHIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n\nJulian Seward, jseward@bzip.org bzip2/libbzip2 version 1.0.6 of 6 September 2010\n\nPATENTS: To the best of my knowledge, bzip2 and libbzip2 do not use any patented algorithms. However, I do not have the resources to carry out a patent search. Therefore I cannot give any guarantee of the above statement."
         }
     },
     "curl": {

src/SPC/builder/BuilderBase.php

@@ -33,12 +33,12 @@ abstract class BuilderBase
     /**
      * Build libraries
      *
-     * @param  array<string>       $libraries Libraries to build
+     * @param  array<string>       $sorted_libraries Libraries to build (if not empty, must sort first)
      * @throws FileSystemException
      * @throws RuntimeException
      * @throws WrongUsageException
      */
-    public function buildLibs(array $libraries): void
+    public function buildLibs(array $sorted_libraries): void
     {
         // search all supported libs
         $support_lib_list = [];
@@ -53,20 +53,18 @@ abstract class BuilderBase
         }
 
         // if no libs specified, compile all supported libs
-        if ($libraries === [] && $this->isLibsOnly()) {
+        if ($sorted_libraries === [] && $this->isLibsOnly()) {
             $libraries = array_keys($support_lib_list);
+            $sorted_libraries = DependencyUtil::getLibsByDeps($libraries);
         }
 
         // pkg-config must be compiled first, whether it is specified or not
-        if (!in_array('pkg-config', $libraries)) {
-            array_unshift($libraries, 'pkg-config');
+        if (!in_array('pkg-config', $sorted_libraries)) {
+            array_unshift($sorted_libraries, 'pkg-config');
         }
 
-        // append dependencies
-        $libraries = DependencyUtil::getLibsByDeps($libraries);
-
         // add lib object for builder
-        foreach ($libraries as $library) {
+        foreach ($sorted_libraries as $library) {
             // if some libs are not supported (but in config "lib.json", throw exception)
             if (!isset($support_lib_list[$library])) {
                 throw new WrongUsageException('library [' . $library . '] is in the lib.json list but not supported to compile, but in the future I will support it!');
@@ -81,7 +79,7 @@ abstract class BuilderBase
         }
 
         // extract sources
-        SourceExtractor::initSource(libs: $libraries);
+        SourceExtractor::initSource(libs: $sorted_libraries);
 
         // build all libs
         foreach ($this->libs as $lib) {

src/SPC/builder/linux/library/imap.php

@@ -47,6 +47,10 @@ class imap extends LinuxLibraryBase
         shell()->cd($this->source_dir)
             ->exec('make clean')
             ->exec('touch ip6')
+            ->exec('chmod +x tools/an')
+            ->exec('chmod +x tools/ua')
+            ->exec('chmod +x src/osdep/unix/drivers')
+            ->exec('chmod +x src/osdep/unix/mkauths')
             ->exec(
                 "yes | make slx {$ssl_options}"
             );

src/SPC/builder/macos/library/imap.php

@@ -50,6 +50,10 @@ class imap extends MacOSLibraryBase
         shell()->cd($this->source_dir)
             ->exec('make clean')
             ->exec('touch ip6')
+            ->exec('chmod +x tools/an')
+            ->exec('chmod +x tools/ua')
+            ->exec('chmod +x src/osdep/unix/drivers')
+            ->exec('chmod +x src/osdep/unix/mkauths')
             ->exec(
                 "yes | EXTRACFLAGS='-Wimplicit-function-declaration -include $(xcrun --show-sdk-path)/usr/include/poll.h -include $(xcrun --show-sdk-path)/usr/include/time.h -include $(xcrun --show-sdk-path)/usr/include/utime.h' make osx {$ssl_options}"
             );

src/SPC/builder/unix/library/brotli.php

@@ -28,10 +28,10 @@ trait brotli
             ->exec('make install DESTDIR=' . BUILD_ROOT_PATH);
         $this->patchPkgconfPrefix(['libbrotlicommon.pc', 'libbrotlidec.pc', 'libbrotlienc.pc']);
         shell()->cd(BUILD_ROOT_PATH . '/lib')
-            ->exec('ln -sf libbrotlicommon.a libbrotlicommon-static.a')
+            ->exec('cp libbrotlicommon.a libbrotlicommon-static.a')
             ->exec('ln -sf libbrotlicommon.a libbrotli.a')
-            ->exec('ln -sf libbrotlidec.a libbrotlidec-static.a')
-            ->exec('ln -sf libbrotlienc.a libbrotlienc-static.a');
+            ->exec('cp libbrotlidec.a libbrotlidec-static.a')
+            ->exec('cp libbrotlienc.a libbrotlienc-static.a');
         foreach (FileSystem::scanDirFiles(BUILD_ROOT_PATH . '/lib/', false, true) as $filename) {
             if (str_starts_with($filename, 'libbrotli') && (str_contains($filename, '.so') || str_ends_with($filename, '.dylib'))) {
                 unlink(BUILD_ROOT_PATH . '/lib/' . $filename);

src/globals/test-extensions.php

@@ -10,14 +10,14 @@ declare(strict_types=1);
 // --------------------------------- edit area ---------------------------------
 
 // If you want to test your added extensions and libs, add below (comma separated, example `bcmath,openssl`).
-$extensions = 'swoole,uv';
+$extensions = 'ldap';
 
 // If you want to test lib-suggests feature with extension, add them below (comma separated, example `libwebp,libavif`).
 $with_libs = '';
 
 // Please change your test base combination. We recommend testing with `common`.
 // You can use `common`, `bulk`, `minimal` or `none`.
-$base_combination = 'minimal';
+$base_combination = 'common';
 
 // -------------------------- code area, do not modify --------------------------