nikola/llama_cpp
1
0
Fork 0
Code Issues Pull Requests Actions 16 Packages Projects Releases Wiki Activity

ci : fix s390x release job (#23898)

Browse Source 
* ci : fix s390x release job

* ci : multi-thread build for `ios-xcode`

* ocd : names
This commit is contained in:
Georgi Gerganov
2026-05-30 09:21:38 +03:00
committed by GitHub
parent d4204b03a5
commit 337528571d
2 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/release.yml
+5 -4
View File
@@ -205,6 +205,7 @@ jobs:
cmake --build build --config Release -j $(nproc) cmake --build build --config Release -j $(nproc)
- name: ccache-clear - name: ccache-clear
if: ${{ matrix.build != 's390x' }}
uses: ./.github/actions/ccache-clear uses: ./.github/actions/ccache-clear
with: with:
key: release-${{ matrix.os }}-cpu key: release-${{ matrix.os }}-cpu
@@ -1200,7 +1201,7 @@ jobs:
path: llama-bin-win-hip-${{ matrix.name }}-x64.zip path: llama-bin-win-hip-${{ matrix.name }}-x64.zip
name: llama-bin-win-hip-${{ matrix.name }}-x64.zip name: llama-bin-win-hip-${{ matrix.name }}-x64.zip
ios-xcode-build: ios-xcode:
needs: [check_release] needs: [check_release]
if: ${{ needs.check_release.outputs.should_release == 'true' }} if: ${{ needs.check_release.outputs.should_release == 'true' }}
# TODO: figure out how to make this work with macos-26 # TODO: figure out how to make this work with macos-26
@@ -1352,7 +1353,7 @@ jobs:
# path: llama-${{ steps.tag.outputs.name }}-bin-${{ matrix.chip_type }}-openEuler-${{ matrix.arch }}${{ matrix.use_acl_graph == 'on' && '-aclgraph' || '' }}.tar.gz # path: llama-${{ steps.tag.outputs.name }}-bin-${{ matrix.chip_type }}-openEuler-${{ matrix.arch }}${{ matrix.use_acl_graph == 'on' && '-aclgraph' || '' }}.tar.gz
# name: llama-bin-${{ matrix.chip_type }}-openEuler-${{ matrix.arch }}${{ matrix.use_acl_graph == 'on' && '-aclgraph' || '' }}.tar.gz # name: llama-bin-${{ matrix.chip_type }}-openEuler-${{ matrix.arch }}${{ matrix.use_acl_graph == 'on' && '-aclgraph' || '' }}.tar.gz
ui-build: ui:
needs: [check_release] needs: [check_release]
if: ${{ needs.check_release.outputs.should_release == 'true' }} if: ${{ needs.check_release.outputs.should_release == 'true' }}
uses: ./.github/workflows/ui-build.yml uses: ./.github/workflows/ui-build.yml
@@ -1380,9 +1381,9 @@ jobs:
#- ubuntu-24-sycl #- ubuntu-24-sycl
- android-arm64 - android-arm64
- macos-cpu - macos-cpu
- ios-xcode-build - ios-xcode
#- openEuler-cann #- openEuler-cann
- ui-build - ui
outputs: outputs:
tag_name: ${{ steps.tag.outputs.name }} tag_name: ${{ steps.tag.outputs.name }}
build-xcframework.sh
+7 -7
View File
@@ -416,7 +416,7 @@ cmake -B build-ios-sim -G Xcode \
-DCMAKE_CXX_FLAGS="${COMMON_CXX_FLAGS}" \ -DCMAKE_CXX_FLAGS="${COMMON_CXX_FLAGS}" \
-DLLAMA_OPENSSL=OFF \ -DLLAMA_OPENSSL=OFF \
-S . -S .
cmake --build build-ios-sim --config Release -- -quiet cmake --build build-ios-sim --config Release -j $(sysctl -n hw.logicalcpu) -- -quiet
echo "Building for iOS devices..." echo "Building for iOS devices..."
cmake -B build-ios-device -G Xcode \ cmake -B build-ios-device -G Xcode \
@@ -430,7 +430,7 @@ cmake -B build-ios-device -G Xcode \
-DCMAKE_CXX_FLAGS="${COMMON_CXX_FLAGS}" \ -DCMAKE_CXX_FLAGS="${COMMON_CXX_FLAGS}" \
-DLLAMA_OPENSSL=OFF \ -DLLAMA_OPENSSL=OFF \
-S . -S .
cmake --build build-ios-device --config Release -- -quiet cmake --build build-ios-device --config Release -j $(sysctl -n hw.logicalcpu) -- -quiet
echo "Building for macOS..." echo "Building for macOS..."
cmake -B build-macos -G Xcode \ cmake -B build-macos -G Xcode \
@@ -441,7 +441,7 @@ cmake -B build-macos -G Xcode \
-DCMAKE_CXX_FLAGS="${COMMON_CXX_FLAGS}" \ -DCMAKE_CXX_FLAGS="${COMMON_CXX_FLAGS}" \
-DLLAMA_OPENSSL=OFF \ -DLLAMA_OPENSSL=OFF \
-S . -S .
cmake --build build-macos --config Release -- -quiet cmake --build build-macos --config Release -j $(sysctl -n hw.logicalcpu) -- -quiet
echo "Building for visionOS..." echo "Building for visionOS..."
cmake -B build-visionos -G Xcode \ cmake -B build-visionos -G Xcode \
@@ -456,7 +456,7 @@ cmake -B build-visionos -G Xcode \
-DLLAMA_OPENSSL=OFF \ -DLLAMA_OPENSSL=OFF \
-DLLAMA_BUILD_SERVER=OFF \ -DLLAMA_BUILD_SERVER=OFF \
-S . -S .
cmake --build build-visionos --config Release -- -quiet cmake --build build-visionos --config Release -j $(sysctl -n hw.logicalcpu) -- -quiet
echo "Building for visionOS simulator..." echo "Building for visionOS simulator..."
cmake -B build-visionos-sim -G Xcode \ cmake -B build-visionos-sim -G Xcode \
@@ -471,7 +471,7 @@ cmake -B build-visionos-sim -G Xcode \
-DLLAMA_OPENSSL=OFF \ -DLLAMA_OPENSSL=OFF \
-DLLAMA_BUILD_SERVER=OFF \ -DLLAMA_BUILD_SERVER=OFF \
-S . -S .
cmake --build build-visionos-sim --config Release -- -quiet cmake --build build-visionos-sim --config Release -j $(sysctl -n hw.logicalcpu) -- -quiet
# Add tvOS builds (might need the same u_int definitions as watchOS and visionOS) # Add tvOS builds (might need the same u_int definitions as watchOS and visionOS)
echo "Building for tvOS simulator..." echo "Building for tvOS simulator..."
@@ -487,7 +487,7 @@ cmake -B build-tvos-sim -G Xcode \
-DCMAKE_CXX_FLAGS="${COMMON_CXX_FLAGS}" \ -DCMAKE_CXX_FLAGS="${COMMON_CXX_FLAGS}" \
-DLLAMA_OPENSSL=OFF \ -DLLAMA_OPENSSL=OFF \
-S . -S .
cmake --build build-tvos-sim --config Release -- -quiet cmake --build build-tvos-sim --config Release -j $(sysctl -n hw.logicalcpu) -- -quiet
echo "Building for tvOS devices..." echo "Building for tvOS devices..."
cmake -B build-tvos-device -G Xcode \ cmake -B build-tvos-device -G Xcode \
@@ -502,7 +502,7 @@ cmake -B build-tvos-device -G Xcode \
-DCMAKE_CXX_FLAGS="${COMMON_CXX_FLAGS}" \ -DCMAKE_CXX_FLAGS="${COMMON_CXX_FLAGS}" \
-DLLAMA_OPENSSL=OFF \ -DLLAMA_OPENSSL=OFF \
-S . -S .
cmake --build build-tvos-device --config Release -- -quiet cmake --build build-tvos-device --config Release -j $(sysctl -n hw.logicalcpu) -- -quiet
# Setup frameworks and copy binaries and headers # Setup frameworks and copy binaries and headers
echo "Setting up framework structures..." echo "Setting up framework structures..."