-
-
Notifications
You must be signed in to change notification settings - Fork 33.9k
gh-136728: Refactor build.yml CI config and multissltests.py #143940
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
base: main
Are you sure you want to change the base?
Conversation
| build-ubuntu-ssltests-awslc, | ||
| build-ubuntu-ssltests-openssl, | ||
| build-ubuntu-ssltests, | ||
| build-wasi, |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
wasi? why is this a part of the patch?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Could be because of conflicts or out-of-date PR?
| run: | | ||
| echo "PATH=/usr/lib/ccache:$PATH" >> "$GITHUB_ENV" | ||
| - name: Configure CPython | ||
| run: | |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
>- makes EOL escaping redundant while allowing for nice line separation of long/logically self-contained components:
| run: | | |
| env: | |
| CONFIGURE_TRAILING_ARGS: >- | |
| ${{ | |
| matrix.ssl != 'openssl' | |
| && '--with-builtin-hashlib-hashes=blake2 --with-ssl-default-suites=openssl' | |
| || '' | |
| }} | |
| run: >- |
| CMD=(./configure CFLAGS="-fdiagnostics-format=json" --config-cache --enable-slower-safety --with-pydebug --with-openssl="$SSL_DIR") | ||
| if [ "${{ matrix.ssl }}" = "openssl" ]; then | ||
| "${CMD[@]}" | ||
| else | ||
| "${CMD[@]}" --with-builtin-hashlib-hashes=blake2 --with-ssl-default-suites=openssl | ||
| fi |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
| CMD=(./configure CFLAGS="-fdiagnostics-format=json" --config-cache --enable-slower-safety --with-pydebug --with-openssl="$SSL_DIR") | |
| if [ "${{ matrix.ssl }}" = "openssl" ]; then | |
| "${CMD[@]}" | |
| else | |
| "${CMD[@]}" --with-builtin-hashlib-hashes=blake2 --with-ssl-default-suites=openssl | |
| fi | |
| ./configure | |
| CFLAGS="-fdiagnostics-format=json" | |
| --config-cache | |
| --enable-slower-safety | |
| --with-pydebug | |
| --with-openssl="$SSL_DIR" | |
| ${CONFIGURE_TRAILING_ARGS} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I prefer the if/else approach. I do not like the notion of 'trailing' args.
Continuation of #136729.
Original description:
Notes
Please see #136728. Changes to
build.ymlare directly adapted from @hugovk's proof-of-concept here.Testing