efc3f2309e
Viktor Szakats
2026-05-26
Subject
GHA: fix locale tests on macOS, extend to verify test 1981
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
.github/workflows/linux.yml+2 -2
| @@ -89,7 +89,7 @@ jobs: | |
| - name: 'libressl krb5' | |
| image: ubuntu-24.04-arm | |
| install_packages: libidn2-dev libnghttp2-dev libldap-dev libkrb5-dev | |
| - | install_steps: libressl-c-arm pytest codeset-test |
| + | install_steps: libressl-c-arm pytest codeset-test1 |
| LDFLAGS: -Wl,-rpath,/home/runner/libressl/lib | |
| configure: --with-openssl=/home/runner/libressl --with-gssapi --enable-debug | |
| @@ -953,7 +953,7 @@ jobs: | |
| TFLAGS+=' --buildinfo' # only test-ci sets this by default, set it manually for test-torture | |
| fi | |
| [ -f ~/venv/bin/activate ] && source ~/venv/bin/activate | |
| - | if [[ "${MATRIX_INSTALL_STEPS}" = *'codeset-test'* ]]; then |
| + | if [[ "${MATRIX_INSTALL_STEPS}" = *'codeset-test1'* ]]; then |
| locale || true | |
| export LC_ALL=C | |
| export LC_CTYPE=C | |
.github/workflows/macos.yml+13 -3
| @@ -347,12 +347,13 @@ jobs: | |
| - name: 'mbedTLS !ldap brotli zstd MultiSSL AppleIDN' | |
| compiler: llvm@18 | |
| install: brotli mbedtls zstd | |
| - | install_steps: codeset-test |
| + | install_steps: codeset-test1 |
| generate: -DCURL_USE_MBEDTLS=ON -DCURL_DISABLE_LDAP=ON -DCURL_DEFAULT_SSL_BACKEND=mbedtls -DCURL_USE_OPENSSL=ON -DUSE_APPLE_IDN=ON -DCURL_ENABLE_NTLM=ON | |
| - name: 'GnuTLS !ldap krb5 +examples' | |
| compiler: clang | |
| install: gnutls nettle krb5 | |
| + | install_steps: codeset-test2 |
| generate: >- | |
| -DENABLE_DEBUG=ON -DCURL_USE_GNUTLS=ON -DCURL_USE_OPENSSL=OFF | |
| -DCURL_USE_GSSAPI=ON -DGSS_ROOT_DIR=/opt/homebrew/opt/krb5 | |
| @@ -560,11 +561,20 @@ jobs: | |
| TFLAGS+=' --buildinfo' # only test-ci sets this by default, set it manually for test-torture | |
| fi | |
| source ~/venv/bin/activate | |
| - | if [[ "${MATRIX_INSTALL_STEPS}" = *'codeset-test'* ]]; then |
| + | if [[ "${MATRIX_INSTALL_STEPS}" = *'codeset-test1'* ]]; then |
| locale || true | |
| - | export LC_ALL=C |
| + | unset LANG |
| + | unset LC_ALL |
| + | unset LC_COLLATE |
| + | unset LC_MESSAGES |
| + | unset LC_MONETARY |
| + | unset LC_TIME |
| export LC_CTYPE=C | |
| export LC_NUMERIC=fr_FR.UTF-8 | |
| + | elif [[ "${MATRIX_INSTALL_STEPS}" = *'codeset-test2'* ]]; then |
| + | locale || true |
| + | unset LC_ALL |
| + | export LC_TIME=fr_FR |
| fi | |
| rm -f ~/.curlrc | |
| if [ "${MATRIX_BUILD}" = 'cmake' ]; then | |