romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-08-24 18:23:33 +03:00
Code Issues Projects Releases Packages Wiki Activity

GHA: fixup CM/AM order within Apple steps, move name: first, quote them

Browse source 
Closes #16092
This commit is contained in:
Viktor Szakats 2025-01-26 14:33:10 +01:00
parent 7c198b59e4
commit 5ce5c62662
No known key found for this signature in database
GPG key ID: B5ABD165E2AEF201
5 changed files with 121 additions and 121 deletions
Download patch file Download diff file Expand all files Collapse all files

34
.github/workflows/non-native.yml vendored
View file

@ -317,14 +317,7 @@ jobs:
- name: 'configure'
run: |
if [ -n '${{ matrix.build.configure }}' ]; then
mkdir bld && cd bld && ../configure --enable-unity --enable-test-bundles --enable-warnings --enable-werror \
--disable-dependency-tracking \
CFLAGS="-isysroot $(xcrun --sdk iphoneos --show-sdk-path 2>/dev/null)" \
--host=aarch64-apple-darwin \
--with-apple-idn \
${{ matrix.build.configure }}
else
if [ -n '${{ matrix.build.generate }}' ]; then
export OPENSSL_DIR=/
# https://cmake.org/cmake/help/latest/manual/cmake-toolchains.7.html#cross-compiling-for-ios-tvos-visionos-or-watchos
[ -n '${{ matrix.build.generator }}' ] && options='-G ${{ matrix.build.generator }}'
@ -332,6 +325,13 @@ jobs:
-DCMAKE_SYSTEM_NAME=iOS \
-DUSE_APPLE_IDN=ON \
${{ matrix.build.generate }} ${options}
else
mkdir bld && cd bld && ../configure --enable-unity --enable-test-bundles --enable-warnings --enable-werror \
--disable-dependency-tracking \
CFLAGS="-isysroot $(xcrun --sdk iphoneos --show-sdk-path 2>/dev/null)" \
--host=aarch64-apple-darwin \
--with-apple-idn \
${{ matrix.build.configure }}
fi
- name: 'configure log'
@ -345,10 +345,10 @@ jobs:
- name: 'build'
run: |
if [ -n '${{ matrix.build.configure }}' ]; then
make -C bld V=1
else
if [ -n '${{ matrix.build.generate }}' ]; then
cmake --build bld --verbose
else
make -C bld V=1
fi
- name: 'curl info'
@ -356,18 +356,18 @@ jobs:
- name: 'build tests'
run: |
if [ -n '${{ matrix.build.configure }}' ]; then
make -C bld V=1 -C tests
else
if [ -n '${{ matrix.build.generate }}' ]; then
cmake --build bld --target testdeps --verbose
else
make -C bld V=1 -C tests
fi
- name: 'build examples'
run: |
if [ -n '${{ matrix.build.configure }}' ]; then
make -C bld examples V=1
else
if [ -n '${{ matrix.build.generate }}' ]; then
cmake --build bld --target curl-examples --verbose
else
make -C bld examples V=1
fi
android: