Skip to content

Add a new CI job with Rust 1.83 and AWS-LC #14541

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.

Sign up for GitHub

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

Merged
alex merged 1 commit into from
Mar 25, 2026
+2 −1
Merged

Add a new CI job with Rust 1.83 and AWS-LC #14541

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ jobs:
# potential future MSRV.
# noclippy due to: https://github.com/PyO3/pyo3/issues/5768
- {VERSION: "3.14", NOXSESSION: "rust-noclippy,tests", RUST: "1.83.0"}
- {VERSION: "3.14", NOXSESSION: "rust-noclippy,tests", RUST: "1.83.0", OPENSSL: {TYPE: "aws-lc", VERSION: "v1.71.0"}}
Copy link
Copy Markdown
Member

@alex alex Mar 25, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Need to make sure the aws-lc bumper script will properly update this. (Set it to some old version and run:

          python3 .github/bin/bump_dependency.py \
            --name "AWS-LC" \
            --repo-url "https://github.com/aws/aws-lc" \
            --branch "main" \
            --file-path ".github/workflows/ci.yml" \
            --current-version-pattern 'TYPE: "aws-lc", VERSION: "(v[0-9\.]*)"' \
            --update-pattern 'TYPE: "aws-lc", VERSION: "{new_version}"' \
            --comment-pattern 'Latest tag of AWS-LC main branch, as of .*?\.' \
            --tag \
            --tag-pattern 'v[0-9\.]*'

Copy link
Copy Markdown
Contributor Author

@DarkaMaul DarkaMaul Mar 25, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The script uses re.search that matches only the first occurrence (the one at line 46), but updates both because it uses re.sub which replaces all occurrences.

cryptography/.github/bin/bump_dependency.py

Line 42 in 0447989

match = re.search(pattern, content)

cryptography/.github/bin/bump_dependency.py

Line 52 in 0447989

new_content = re.sub(old_pattern, new_value, content)

The script will update both if the first occurrence needs to be updated. If the initial version of the file is in sync, it would be automatically handled.

So I would say the support is accidental - I can update the script to be more explicit.

New PR, or since it's going to be a ~20 lines change, that could fit into this one?

Copy link
Copy Markdown
Member

@alex alex Mar 25, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

follow up PR is fine

- {VERSION: "3.14", NOXSESSION: "rust,tests", RUST: "beta"}
- {VERSION: "3.14", NOXSESSION: "rust,tests", RUST: "nightly"}
- {VERSION: "3.14", NOXSESSION: "tests-rust-debug"}
Expand Down Expand Up @@ -118,7 +119,7 @@ jobs:
echo "CFLAGS=${CFLAGS} -Werror=implicit-function-declaration" >> $GITHUB_ENV
echo "RUSTFLAGS=-Clink-arg=-Wl,-rpath=${OSSL_PATH}/lib -Clink-arg=-Wl,-rpath=${OSSL_PATH}/lib64" >> $GITHUB_ENV
if: matrix.PYTHON.OPENSSL
- run: cargo install bindgen-cli
- run: rustup run stable cargo install bindgen-cli
Copy link
Copy Markdown
Contributor Author

@DarkaMaul DarkaMaul Mar 25, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Using cargo install directly here yields to a problem because the version is too old for bindgen-cli when using Rust 1.83

(proof)

if: matrix.PYTHON.OPENSSL.TYPE == 'boringssl' || matrix.PYTHON.OPENSSL.TYPE == 'aws-lc'
- name: Cache rust and pip
uses: ./.github/actions/cache
Expand Down