Skip to content

Commit fcece48

Browse files
authored
Update macos.yml
1 parent 457d97c commit fcece48

File tree

1 file changed

+22
-9
lines changed

1 file changed

+22
-9
lines changed

.github/workflows/macos.yml

Lines changed: 22 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ permissions: {}
4444

4545
env:
4646
CURL_CI: github
47+
CURL_TEST_MIN: 1700
4748
MAKEFLAGS: -j 4
4849
LDFLAGS: -w # suppress 'object file was built for newer macOS version than being linked' warnings
4950

@@ -94,6 +95,7 @@ jobs:
9495
steps:
9596
- name: 'brew install'
9697
if: ${{ matrix.build.configure }}
98+
timeout-minutes: 5
9799
run: |
98100
# shellcheck disable=SC2181,SC2034
99101
while [[ $? == 0 ]]; do for i in 1 2 3; do if brew update && brew install automake libtool; then break 2; else echo Error: wait to try again; sleep 10; fi; done; false Too many retries; done
@@ -111,7 +113,7 @@ jobs:
111113
112114
- name: 'cache libressl'
113115
if: ${{ contains(matrix.build.install_steps, 'libressl') }}
114-
uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
116+
uses: actions/cache@9255dc7a253b0ccc959486e2bca901246202afeb # v5.0.1
115117
id: cache-libressl
116118
env:
117119
cache-name: cache-libressl
@@ -135,7 +137,7 @@ jobs:
135137
cmake --build .
136138
cmake --install . --verbose
137139
138-
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
140+
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
139141
with:
140142
persist-credentials: false
141143

@@ -205,7 +207,7 @@ jobs:
205207
macos:
206208
name: "${{ matrix.build.generate && 'CM' || 'AM' }} ${{ matrix.compiler }} ${{ matrix.build.name }}"
207209
runs-on: 'macos-15'
208-
timeout-minutes: 45
210+
timeout-minutes: 25
209211
env:
210212
DEVELOPER_DIR: "/Applications/Xcode${{ matrix.build.xcode && format('_{0}', matrix.build.xcode) || '' }}.app/Contents/Developer"
211213
CC: '${{ matrix.compiler }}'
@@ -224,16 +226,20 @@ jobs:
224226
compiler: clang
225227
install: brotli zstd
226228
configure: --without-ssl --with-brotli --with-zstd
229+
tflags: '--min=1450'
227230
xcode: '' # default Xcode. Set it once to silence actionlint.
228231
- name: '!ssl !debug'
229232
compiler: gcc-13
230233
configure: --without-ssl
234+
tflags: '--min=950'
231235
- name: '!ssl'
232236
compiler: clang
233237
configure: --enable-debug --without-ssl
238+
tflags: '--min=1500'
234239
- name: '!ssl libssh2 AppleIDN'
235240
compiler: clang
236241
configure: --enable-debug --with-libssh2=/opt/homebrew/opt/libssh2 --without-ssl --with-apple-idn
242+
tflags: '--min=1550'
237243
- name: 'OpenSSL libssh c-ares'
238244
compiler: clang
239245
install: libssh
@@ -245,8 +251,10 @@ jobs:
245251
- name: '!ssl c-ares'
246252
compiler: clang
247253
configure: --enable-debug --enable-ares --without-ssl
254+
tflags: '--min=1500'
248255
- name: '!ssl HTTP-only'
249256
compiler: clang
257+
tflags: '--min=950'
250258
configure: >-
251259
--enable-debug
252260
--disable-alt-svc --disable-dict --disable-file --disable-ftp --disable-gopher --disable-imap
@@ -276,7 +284,7 @@ jobs:
276284
- name: 'OpenSSL event-based'
277285
compiler: clang
278286
configure: --enable-debug --with-openssl=/opt/homebrew/opt/openssl
279-
tflags: --test-event
287+
tflags: '--test-event --min=1300'
280288
# cmake
281289
- name: 'OpenSSL gsasl rtmp AppleIDN SecTrust +examples'
282290
install: libnghttp3 libngtcp2 gsasl rtmpdump
@@ -327,18 +335,19 @@ jobs:
327335
compiler: clang
328336
install: rustls-ffi
329337
generate: -DENABLE_DEBUG=ON -DCURL_USE_RUSTLS=ON -DUSE_ECH=ON -DCURL_DISABLE_LDAP=ON
338+
tflags: '--min=1650'
330339
- name: 'OpenSSL torture !FTP'
331340
compiler: clang
332341
install: libnghttp3
333342
install_steps: torture
334343
generate: -DENABLE_DEBUG=ON -DBUILD_SHARED_LIBS=OFF -DENABLE_THREADED_RESOLVER=OFF -DOPENSSL_ROOT_DIR=/opt/homebrew/opt/openssl -DUSE_OPENSSL_QUIC=ON
335-
tflags: -t --shallow=25 !FTP
344+
tflags: '-t --shallow=25 !FTP --min=1450'
336345
- name: 'OpenSSL torture FTP'
337346
compiler: clang
338347
install: libnghttp3
339348
install_steps: torture
340349
generate: -DENABLE_DEBUG=ON -DBUILD_SHARED_LIBS=OFF -DENABLE_THREADED_RESOLVER=OFF -DOPENSSL_ROOT_DIR=/opt/homebrew/opt/openssl -DUSE_OPENSSL_QUIC=ON
341-
tflags: -t --shallow=20 FTP
350+
tflags: '-t --shallow=20 FTP --min=260'
342351
exclude:
343352
# opt out jobs from combinations that have the compiler set manually
344353
- { compiler: llvm@18, build: { compiler: 'clang' } }
@@ -350,6 +359,7 @@ jobs:
350359

351360
steps:
352361
- name: 'brew install'
362+
timeout-minutes: 5
353363
# Run this command with retries because of spurious failures seen
354364
# while running the tests, for example
355365
# https://github.com/curl/curl/runs/4095721123?check_suite_focus=true
@@ -383,7 +393,7 @@ jobs:
383393
echo '::group::macros predefined'; "${CC}" -dM -E - < /dev/null | sort || true; echo '::endgroup::'
384394
echo '::group::brew packages installed'; ls -l /opt/homebrew/opt; echo '::endgroup::'
385395
386-
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
396+
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
387397
with:
388398
persist-credentials: false
389399

@@ -497,6 +507,9 @@ jobs:
497507
TFLAGS: '${{ matrix.build.tflags }}'
498508
run: |
499509
TFLAGS="-j20 ${TFLAGS}"
510+
if [ "${TEST_TARGET}" != 'test-ci' ]; then
511+
TFLAGS+=' --buildinfo' # only test-ci sets this by default, set it manually for test-torture
512+
fi
500513
source ~/venv/bin/activate
501514
if [[ "${MATRIX_INSTALL_STEPS}" = *'codeset-test'* ]]; then
502515
locale || true
@@ -603,7 +616,7 @@ jobs:
603616
echo '::group::macros predefined'; "${CC}" -dM -E - < /dev/null | sort || true; echo '::endgroup::'
604617
echo '::group::brew packages preinstalled'; ls -l /opt/homebrew/opt; echo '::endgroup::'
605618
606-
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
619+
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
607620
with:
608621
persist-credentials: false
609622

@@ -613,7 +626,7 @@ jobs:
613626

614627
- name: 'configure / ${{ matrix.build }}'
615628
run: |
616-
if [ "${MATRIX_COMPILER}" = 'gcc-13' ] && [ "${MATRIX_IMAGE}" = 'macos-15' ] ; then
629+
if [ "${MATRIX_COMPILER}" = 'gcc-13' ] && [ "${MATRIX_IMAGE}" = 'macos-15' ]; then
617630
# Ref: https://github.com/Homebrew/homebrew-core/issues/194778#issuecomment-2793243409
618631
/opt/homebrew/opt/gcc@13/libexec/gcc/aarch64-apple-darwin24/13/install-tools/mkheaders
619632
fi

0 commit comments

Comments
 (0)