mirror of
https://github.com/NLnetLabs/unbound.git
synced 2025-12-18 14:56:05 -05:00
Update ios ci with older sdk version to use.
This commit is contained in:
parent
6a5385f291
commit
5423c0a8e9
3 changed files with 14 additions and 2 deletions
7
.github/workflows/analysis_ports.yml
vendored
7
.github/workflows/analysis_ports.yml
vendored
|
|
@ -54,6 +54,7 @@ jobs:
|
|||
OPENSSL_HOST: ios-cross
|
||||
IOS_SDK: iPhoneOS
|
||||
IOS_CPU: armv7s
|
||||
SDK_VERSION: 18.0
|
||||
test_ios: "yes"
|
||||
config: "no"
|
||||
make: "no"
|
||||
|
|
@ -63,6 +64,7 @@ jobs:
|
|||
OPENSSL_HOST: ios64-cross
|
||||
IOS_SDK: iPhoneOS
|
||||
IOS_CPU: arm64
|
||||
SDK_VERSION: 18.0
|
||||
test_ios: "yes"
|
||||
config: "no"
|
||||
make: "no"
|
||||
|
|
@ -72,6 +74,7 @@ jobs:
|
|||
OPENSSL_HOST: ios64-cross
|
||||
IOS_SDK: AppleTVOS
|
||||
IOS_CPU: arm64
|
||||
SDK_VERSION: 18.0
|
||||
test_ios: "yes"
|
||||
config: "no"
|
||||
make: "no"
|
||||
|
|
@ -90,6 +93,7 @@ jobs:
|
|||
OPENSSL_HOST: iphoneos-cross
|
||||
IOS_SDK: iPhoneSimulator
|
||||
IOS_CPU: i386
|
||||
SDK_VERSION: 18.0
|
||||
test_ios: "yes"
|
||||
config: "no"
|
||||
make: "no"
|
||||
|
|
@ -99,6 +103,7 @@ jobs:
|
|||
OPENSSL_HOST: iphoneos-cross
|
||||
IOS_SDK: iPhoneSimulator
|
||||
IOS_CPU: x86_64
|
||||
SDK_VERSION: 18.0
|
||||
test_ios: "yes"
|
||||
config: "no"
|
||||
make: "no"
|
||||
|
|
@ -108,6 +113,7 @@ jobs:
|
|||
OPENSSL_HOST: iphoneos-cross
|
||||
IOS_SDK: AppleTVSimulator
|
||||
IOS_CPU: x86_64
|
||||
SDK_VERSION: 18.0
|
||||
test_ios: "yes"
|
||||
config: "no"
|
||||
make: "no"
|
||||
|
|
@ -329,6 +335,7 @@ jobs:
|
|||
OPENSSL_HOST: ${{ matrix.OPENSSL_HOST }}
|
||||
IOS_SDK: ${{ matrix.IOS_SDK }}
|
||||
IOS_CPU: ${{ matrix.IOS_CPU }}
|
||||
SDK_VERSION: ${{ matrix.SDK_VERSION }}
|
||||
run: |
|
||||
#(already installed) ./contrib/ios/install_tools.sh
|
||||
export AUTOTOOLS_BUILD="$(./config.guess)"
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
#!/usr/bin/env bash
|
||||
OPENSSL_VERSION=3.0.18
|
||||
OPENSSL_VERSION=1.1.1d
|
||||
|
||||
echo "Downloading OpenSSL"
|
||||
if ! curl -L -k -s -o openssl-$OPENSSL_VERSION.tar.gz https://www.openssl.org/source/openssl-$OPENSSL_VERSION.tar.gz;
|
||||
|
|
@ -33,7 +33,7 @@ if ! patch -u -p0 < ../contrib/ios/openssl.patch; then
|
|||
fi
|
||||
|
||||
echo "Configuring OpenSSL"
|
||||
if ! ./Configure "$OPENSSL_HOST" -DNO_FORK no-comp no-asm no-engine no-tests no-unit-test \
|
||||
if ! ./Configure "$OPENSSL_HOST" -DNO_FORK no-comp no-asm no-hw no-engine no-tests no-unit-test \
|
||||
--prefix="$IOS_PREFIX" --openssldir="$IOS_PREFIX"; then
|
||||
echo "Failed to configure OpenSSL"
|
||||
exit 1
|
||||
|
|
|
|||
|
|
@ -175,6 +175,7 @@ fi
|
|||
# For example, remove 4.3, 6.2, and 6.1 if they are not installed. We go back to
|
||||
# the 1.0 SDKs because Apple WatchOS uses low numbers, like 2.0 and 2.1.
|
||||
XCODE_SDK=
|
||||
if test -z "$SDK_VERSION"; then
|
||||
for i in $(seq -f "%.1f" 30.0 -0.1 1.0)
|
||||
do
|
||||
if [ -d "$XCODE_DEVELOPER_SDK/Developer/SDKs/$IOS_SDK$i.sdk" ]; then
|
||||
|
|
@ -182,6 +183,10 @@ do
|
|||
break
|
||||
fi
|
||||
done
|
||||
else
|
||||
i="$SDK_VERSION"
|
||||
XCODE_SDK="$IOS_SDK$i.sdk"
|
||||
fi
|
||||
|
||||
# Error checking
|
||||
if [ -z "$XCODE_SDK" ]; then
|
||||
|
|
|
|||
Loading…
Reference in a new issue