Merge branch 'php/8.2' into php/8.3

pmmp · Jan 5, 2024 · 8b0f0b3 · 8b0f0b3
2 parents 7a3b5b6 + 6f619bf
commit 8b0f0b3
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -48,7 +48,7 @@ jobs:
           tar -czf ./PHP-Linux-x86_64-PM${{ matrix.pm-version-major }}-debugging-symbols.tar.gz bin-debug
 
       - name: Upload artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         if: always()
         with:
           name: Linux-PM${{ matrix.pm-version-major }}
@@ -63,7 +63,7 @@ jobs:
         run: tar -czf workspace.tar.gz install_data
 
       - name: Upload workspace
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         if: failure()
         with:
           name: Linux-workspace-PM${{ matrix.pm-version-major }}
@@ -105,7 +105,7 @@ jobs:
           tar -czf ./PHP-MacOS-x86_64-PM${{ matrix.pm-version-major }}-debugging-symbols.tar.gz bin-debug
         
       - name: Upload artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         if: always()
         with:
           name: MacOS-PM${{ matrix.pm-version-major }}
@@ -120,7 +120,7 @@ jobs:
         run: tar -czf workspace.tar.gz install_data
 
       - name: Upload workspace
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         if: failure()
         with:
           name: MacOS-workspace-PM${{ matrix.pm-version-major }}
@@ -156,7 +156,7 @@ jobs:
           move temp\*.zip .
 
       - name: Upload artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         if: always()
         with:
           name: Windows-PM${{ matrix.pm-version-major }}
@@ -186,7 +186,7 @@ jobs:
           git push -f origin php-${{ steps.version.outputs.PHP_VERSION }}-latest
 
       - name: Download artifacts
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           path: ${{ github.workspace }}
 

diff --git a/compile.sh b/compile.sh
@@ -633,6 +633,9 @@ function build_curl {
 		download_github_src "curl/curl" "$CURL_VERSION" "curl" | tar -zx >> "$DIR/install.log" 2>&1
 		write_configure
 		cd "$curl_dir"
+		if [[ "$(uname -s)" == "Darwin" ]]; then
+			sed -i'.bak' 's/^CURL_CONVERT_INCLUDE_TO_ISYSTEM//' ./configure.ac
+		fi
 		./buildconf --force >> "$DIR/install.log" 2>&1
 		RANLIB=$RANLIB ./configure --disable-dependency-tracking \
 		--enable-ipv6 \