Skip to content

Commit ddf2e85

Browse files
committed
Move azure to macos-latest
1 parent fd37b37 commit ddf2e85

File tree

2 files changed

+15
-1
lines changed

2 files changed

+15
-1
lines changed

azure-pipelines.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
- job: build_macos
4141
displayName: macOS
4242
pool:
43-
vmImage: 'macos-12'
43+
vmImage: 'macos-latest'
4444
steps:
4545
- checkout: self
4646
submodules: true

util/build_osx.sh

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,13 @@ if [ "$(otool -L "src/${BINARY_NAME}" | tail -n +2 | grep -v -E "${ALLOWED_DL_LI
6262
exit 1
6363
fi
6464

65+
if ! vtool -show "src/${BINARY_NAME}" | tee | grep minos | \
66+
awk -v version="${MACOSX_DEPLOYMENT_TARGET}" '$2 > version { exit 1 }'
67+
then
68+
echo "macOS deployment target was not set correctly"
69+
exit 1
70+
fi
71+
6572
export MACOSX_DEPLOYMENT_TARGET=11.0
6673

6774
mkdir -p "$BUILD/build_libomp/openmp-${OMPVERSION}.src/build-arm64" && cd "$BUILD/build_libomp/openmp-${OMPVERSION}.src/build-arm64"
@@ -94,6 +101,13 @@ if [ "$(otool -L "src/${BINARY_NAME}" | tail -n +2 | grep -v -E "${ALLOWED_DL_LI
94101
exit 1
95102
fi
96103

104+
if ! vtool -show "src/${BINARY_NAME}" | tee | grep minos | \
105+
awk -v version="${MACOSX_DEPLOYMENT_TARGET}" '$2 > version { exit 1 }'
106+
then
107+
echo "macOS deployment target was not set correctly"
108+
exit 1
109+
fi
110+
97111
lipo \
98112
-create \
99113
-arch x86_64 "$BUILD/build_avx2/src/${BINARY_NAME}" \

0 commit comments

Comments
 (0)