Merge pull request #45 from jamesx-improving/ci/jamesx-test-pie-mac-2nd-fix

jamesx-improving · web-flow · commit 81c92f85bfec · 2025-11-05T01:23:08.000-08:00
CI: test-pie CI on mac 2nd fix
diff --git a/.github/workflows/build-php-wrapper/action.yml b/.github/workflows/build-php-wrapper/action.yml
@@ -25,7 +25,7 @@ runs:
       with:
         php-version: ${{ inputs.php-version }}
         extensions: tokenizer, json, ctype, iconv, mbstring
-        tools: none
+        tools: composer
       env:
         runner: self-hosted
 
@@ -56,7 +56,7 @@ runs:
       if: ${{ inputs.os == 'macos' }}
       shell: bash
       run: |
-        brew install autoconf automake libtool pkg-config protobuf@3 openssl clang-format
+        brew install autoconf automake libtool pkg-config protobuf openssl clang-format
 
     - name: Install protobuf compiler (Ubuntu)
       if: ${{ inputs.os == 'ubuntu' }}
@@ -73,7 +73,6 @@ runs:
       if: ${{ inputs.os == 'macos' }}
       shell: bash
       run: |
-        echo 'export PATH="/opt/homebrew/opt/protobuf@3/bin:$PATH"' >> $GITHUB_ENV
         # Install protobuf-c
         brew install protobuf-c
 
diff --git a/.github/workflows/install-zig/action.yml b/.github/workflows/install-zig/action.yml
@@ -6,7 +6,9 @@ runs:
     - name: Install zig
       shell: bash
       run: |
-        if [[ `cat /etc/os-release | grep "Amazon Linux"` ]]; then
+        if [[ "$OSTYPE" == "darwin"* ]]; then
+            echo "macOS detected, pip3 already available"
+        elif [[ `cat /etc/os-release | grep "Amazon Linux"` ]]; then
             yum install -y python3-pip
         else
             sudo apt install -y python3-pip
diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
@@ -219,7 +219,8 @@ jobs:
       - name: Install shared dependencies
         uses: ./.github/workflows/install-shared-dependencies
         with:
-          target: x86_64-apple-darwin
+          # "macos-latest" is actually an ARM runner, hence using the ARM target for mac here
+          target: aarch64-apple-darwin
           github-token: ${{ secrets.GITHUB_TOKEN }}
           engine-version: ${{ matrix.engine.version }}
 
diff --git a/.github/workflows/run-php-tests/action.yml b/.github/workflows/run-php-tests/action.yml
@@ -77,43 +77,40 @@ runs:
       env:
         EXTENSION_PATH: ${{ inputs.extension-path }}
       run: |
-        # Debug: Check if extension is loaded and classes exist
-        echo "=== Extension Debug Info ==="
-        echo "Extension path: $EXTENSION_PATH"
+        # Find the actual .so file location
+        SO_FILE=""
 
-        # Check if this is a file path or extension name
+        # Check common locations
         if [[ -f "$EXTENSION_PATH" ]]; then
-          echo "Loading extension from file: $EXTENSION_PATH"
-          EXTENSION_ARG="extension=$EXTENSION_PATH"
+          SO_FILE="$EXTENSION_PATH"
+        elif [[ -f "$(php-config --extension-dir)/${EXTENSION_PATH}.so" ]]; then
+          SO_FILE="$(php-config --extension-dir)/${EXTENSION_PATH}.so"
         else
-          echo "Loading extension by name: $EXTENSION_PATH"
-          EXTENSION_ARG="extension=$EXTENSION_PATH"
+          # Search for the extension in common PHP directories
+          for dir in /opt/homebrew/lib/php/pecl /opt/homebrew/Cellar/php*/*/pecl /usr/lib/php; do
+            FOUND=$(find "$dir" -name "${EXTENSION_PATH}.so" 2>/dev/null | head -1)
+            if [[ -n "$FOUND" ]]; then
+              SO_FILE="$FOUND"
+              break
+            fi
+          done
+        fi
+
+        if [[ -z "$SO_FILE" ]]; then
+          echo "ERROR: Extension .so file not found"
+          exit 1
         fi
 
-        php -n -d "$EXTENSION_ARG" -r "
+        echo "=== Extension Debug Info ==="
+        echo "Found extension at: $SO_FILE"
+
+        php -n -d "extension=$SO_FILE" -r "
           echo 'Extension loaded: ' . (extension_loaded('valkey_glide') ? 'YES' : 'NO') . PHP_EOL;
-          echo 'Extension version: ' . phpversion('valkey_glide') . PHP_EOL;
-          echo 'Extension functions: ' . PHP_EOL;
-          foreach (get_extension_funcs('valkey_glide') as \$func) {
-            echo '  - ' . \$func . PHP_EOL;
-          }
-          echo 'All declared classes: ' . PHP_EOL;
-          foreach (get_declared_classes() as \$class) {
-            if (strpos(\$class, 'Valkey') !== false || strpos(\$class, 'Client') !== false || strpos(\$class, 'Mock') !== false) {
-              echo '  - ' . \$class . PHP_EOL;
-            }
-          }
           echo 'ClientConstructorMock exists: ' . (class_exists('ClientConstructorMock') ? 'YES' : 'NO') . PHP_EOL;
-          if (class_exists('ClientConstructorMock')) {
-            echo 'ClientConstructorMock methods: ' . PHP_EOL;
-            foreach (get_class_methods('ClientConstructorMock') as \$method) {
-              echo '  - ' . \$method . PHP_EOL;
-            }
-          }
         "
 
-        # Run tests using extension loading
-        php -n -d "$EXTENSION_ARG" tests/TestValkeyGlide.php
+        # Run tests
+        php -n -d "extension=$SO_FILE" tests/TestValkeyGlide.php
 
     - name: Run integration tests
       shell: bash
diff --git a/.github/workflows/setup-php-extension/action.yml b/.github/workflows/setup-php-extension/action.yml
@@ -10,14 +10,35 @@ inputs:
     description: Whether to install composer dependencies
     required: false
     default: "true"
+  target:
+    description: "Specified target for rust toolchain, ex. x86_64-apple-darwin"
+    type: string
+    required: false
+    defalt: "x86_64-unknown-linux-gnu"
+    options:
+      - x86_64-unknown-linux-gnu
+      - aarch64-unknown-linux-gnu
+      - x86_64-apple-darwin
+      - aarch64-apple-darwin
+      - aarch64-unknown-linux-musl
+      - x86_64-unknown-linux-musl
+  os:
+    description: "The current operating system"
+    required: true
+    type: string
+    options:
+      - amazon-linux
+      - macos
+      - ubuntu
 
 runs:
   using: composite
   steps:
     - name: Install shared dependencies
       uses: ./.github/workflows/install-shared-dependencies
       with:
-        target: x86_64-unknown-linux-gnu
+        os: ${{ inputs.os }}
+        target: ${{ inputs.target }}
         github-token: ${{ github.token }}
         engine-version: "7.2.5"
 
@@ -28,7 +49,8 @@ runs:
         extensions: none
         tools: pie, jq
 
-    - name: Install system dependencies
+    - name: Install system dependencies for Ubuntu
+      if: inputs.os == 'ubuntu'
       shell: bash
       env:
         PHP_VERSION: ${{ inputs.php-version }}
@@ -49,6 +71,12 @@ runs:
             libprotobuf-c-dev \
             libprotobuf-c1
 
+    - name: Install system dependencies for macOS
+      if: inputs.os == 'macos'
+      shell: bash
+      run: |
+        brew install autoconf automake libtool pkg-config protobuf-c clang-format
+
     - name: Install Rust and protoc
       uses: ./.github/workflows/install-rust-and-protoc
       with:
diff --git a/.github/workflows/test-pie.yml b/.github/workflows/test-pie.yml
@@ -58,6 +58,8 @@ jobs:
         with:
           php-version: ${{ matrix.php }}
           install-composer-deps: "true"
+          target: ${{ matrix.host.TARGET }}
+          os: ${{ matrix.host.OS }}
 
       - name: Create manual Composer repository
         run: |
@@ -97,7 +99,20 @@ jobs:
           # Start HTTP server
           cd web && python3 -m http.server 8000 &
           echo $! > ../server.pid
-          sleep 3
+
+          # Wait for server to be ready with proper health check
+          echo "Waiting for HTTP server to start..."
+          for i in {1..30}; do
+            if curl -s http://localhost:8000/packages.json >/dev/null 2>&1; then
+              echo "HTTP server is ready"
+              break
+            fi
+            if [ $i -eq 30 ]; then
+              echo "HTTP server failed to start after 30 seconds"
+              exit 1
+            fi
+            sleep 1
+          done
 
       - name: Test PIE with manual repository
         run: |
@@ -107,7 +122,10 @@ jobs:
 
           # Initialize composer config directories and fix permissions
           mkdir -p "$HOME/.config/composer"
-          sudo mkdir -p /root/.config/composer
+          # Skip root directory creation on macOS due to SIP
+          if [[ "${{ matrix.host.OS }}" != "macos" ]]; then
+            sudo mkdir -p /root/.config/composer
+          fi
 
           # Make sure root can read the user's composer config
           sudo chmod -R 755 "$HOME/.config/composer"
@@ -117,6 +135,17 @@ jobs:
             sudo chown -R root:root "$HOME/.config/composer" || true
           fi
 
+          # Verify HTTP server is accessible before proceeding
+          echo "=== Verifying HTTP server accessibility ==="
+          curl -v http://localhost:8000/packages.json || {
+            echo "ERROR: Cannot access local HTTP server"
+            echo "Server process status:"
+            ps aux | grep "python.*http.server" || echo "No HTTP server process found"
+            echo "Port 8000 status:"
+            lsof -i :8000 || echo "Port 8000 not in use"
+            exit 1
+          }
+
           # Add local repository
           pie repository:add composer http://localhost:8000
 
@@ -201,6 +230,28 @@ jobs:
           php-config --extension-dir
           ls -la $(php-config --extension-dir) | grep valkey || echo "valkey_glide.so not found in extension directory"
 
+          # Check if PIE installed to a different location (macOS Homebrew specific)
+          if [[ "${{ matrix.host.OS }}" == "macos" ]]; then
+            echo "=== Checking alternative extension locations ==="
+            find /opt/homebrew/lib/php -name "valkey_glide.so" 2>/dev/null || echo "No valkey_glide.so found in /opt/homebrew/lib/php"
+            
+            # If found in alternative location, create symlink
+            ALT_SO=$(find /opt/homebrew/lib/php -name "valkey_glide.so" 2>/dev/null | head -1)
+            if [ -n "$ALT_SO" ] && [ ! -f "$(php-config --extension-dir)/valkey_glide.so" ]; then
+              echo "Found extension at: $ALT_SO"
+              echo "Creating symlink to: $(php-config --extension-dir)/valkey_glide.so"
+              sudo ln -sf "$ALT_SO" "$(php-config --extension-dir)/valkey_glide.so"
+            fi
+          fi
+
+          # If extension was built but not installed, install it manually
+          PIE_SO=$(find "$HOME/.config/pie" -name "valkey_glide.so" -type f 2>/dev/null | head -1)
+          if [ -n "$PIE_SO" ] && [ ! -f "$(php-config --extension-dir)/valkey_glide.so" ]; then
+            echo "Installing extension from: $PIE_SO"
+            sudo cp "$PIE_SO" "$(php-config --extension-dir)/valkey_glide.so"
+            echo "Extension installed to: $(php-config --extension-dir)/valkey_glide.so"
+          fi
+
           echo "=== Looking for built extension in PIE working directory ==="
           PIE_WORK_DIR=$(find "$HOME/.config/pie" -name "valkey-glide-php" -type d | head -1)
           if [ -n "$PIE_WORK_DIR" ]; then
diff --git a/.vscode/launch.json b/.vscode/launch.json
diff --git a/.vscode/settings.json b/.vscode/settings.json
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
