Skip to content
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

Take test fixes for 0.1 release branch, and prepare 0.1.2 #130

Merged
merged 16 commits into from
Aug 23, 2024

Conversation

ctz
Copy link
Member

@ctz ctz commented Aug 23, 2024

This is the tail end of #127, plus a version bump, plus test churn commits. That gets cargo test working for me locally. Let's see what CI thinks...

@complexspaces
Copy link
Collaborator

CI is definitely not happy with the outdated Android image and new* clippy lints 😢

@ctz ctz force-pushed the jbp-prepare-0.1.2 branch from 72b79da to 5d43f65 Compare August 23, 2024 14:41
@complexspaces complexspaces mentioned this pull request Aug 23, 2024
@ctz ctz force-pushed the jbp-prepare-0.1.2 branch from 5d43f65 to f844b43 Compare August 23, 2024 14:46
@ctz
Copy link
Member Author

ctz commented Aug 23, 2024

CI is definitely not happy with the outdated Android image and new* clippy lints 😢

lol, please excuse the noise while I determine the precise set of testing/infra commits to cherry pick...

ctz and others added 16 commits August 23, 2024 15:49
Fixing the `SystemTime` that we pass to the certificate verifier for the
mock and real world verification tests will ensure that the tests don't
start to fail just because the vendored certificates have expired.
* Updates the test cert for presently unknown reasons the previous EE
  cert is returning an error in the Android real world verification test
  suite that appears resolved by refreshing the EE cert.
* Updates the mock verification timestamp to be newer than the LE EE
  cert's NotBefore date.
The existing copy expired yesterday. Along with updating the cert the
fixed verification time is updated so that we avoid a not-yet-valid
error from the updated cert's NotBefore date being newer than the
previous fixed verification time.
* Runs `update_valid_ee_certs.rs`, committing the two updated `.crt`
  files that result.
* Updates the `verification_time()` to the current time to avoid not
  before errors.
Commits the result of running `src/tests/verification_mock/ca.go`.

The `root1.crt` CA and intermediate expired and were breaking tests in
CI.
Fixes clippy findings of the form:

```
error: doc list item missing indentation
  --> rustls-platform-verifier/src/tests/verification_real_world/mod.rs:17:5
   |
17 | //! with the measures mentioned in the next paragraphs, the operating system
   |     ^
   |
   = help: if this is supposed to be its own paragraph, add a blank line
   = help: for further information visit https://rust-lang.github.io/rust-clippy/master/index.html#doc_lazy_continuation
   = note: `-D clippy::doc-lazy-continuation` implied by `-D warnings`
   = help: to override `-D warnings` add `#[allow(clippy::doc_lazy_continuation)]`
```
Previously the Android emulator based CI job was using the larger
`googles_api` target instead of the slimmer default. This was done to
ensure network access worked as intended for the real-world test suite
with a TODO to revisit after an upstream bug was fixed.

In the meantime the upstream bug has been closed and we've upgraded the
emulator action version. Let's try the default target again and
hopefully get a small CI speedup.
Bumps [reactivecircus/android-emulator-runner](https://github.com/reactivecircus/android-emulator-runner) from 2.30.1 to 2.31.0.
- [Release notes](https://github.com/reactivecircus/android-emulator-runner/releases)
- [Changelog](https://github.com/ReactiveCircus/android-emulator-runner/blob/main/CHANGELOG.md)
- [Commits](ReactiveCircus/android-emulator-runner@6b0df4b...77986be)

---
updated-dependencies:
- dependency-name: reactivecircus/android-emulator-runner
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [reactivecircus/android-emulator-runner](https://github.com/reactivecircus/android-emulator-runner) from 2.31.0 to 2.32.0.
- [Release notes](https://github.com/reactivecircus/android-emulator-runner/releases)
- [Changelog](https://github.com/ReactiveCircus/android-emulator-runner/blob/main/CHANGELOG.md)
- [Commits](ReactiveCircus/android-emulator-runner@77986be...f0d1ed2)

---
updated-dependencies:
- dependency-name: reactivecircus/android-emulator-runner
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
This avoids using a rustls version with a known vulnerability.
@ctz ctz force-pushed the jbp-prepare-0.1.2 branch from f844b43 to 897f8a5 Compare August 23, 2024 15:03
@ctz
Copy link
Member Author

ctz commented Aug 23, 2024

ok, whew. ready for review.

all but the final two commits are already on main.

@complexspaces
Copy link
Collaborator

complexspaces commented Aug 23, 2024

FWIW in the future I can handle the bulk of 0.1 release work since this branch exists almost solely for use at my employer and I don't want it to burden the other maintainers with that need.

I'll take a look at the changes here either way though 👍

Copy link
Collaborator

@complexspaces complexspaces left a comment

Choose a reason for hiding this comment

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

This looks good to me. I sanity-checked the lockfile effects of this one internally at work and the result is clean 🎉.

I double checked the existing commits from main match what I'd expect as well, so LGTM.

@ctz
Copy link
Member Author

ctz commented Aug 23, 2024

Can I leave you to merge this and make the release?

@complexspaces
Copy link
Collaborator

Sure, I'd be happy to handle that. Thanks for getting the branch caught up in CI.

@complexspaces complexspaces merged commit 7094476 into rel-0.1 Aug 23, 2024
16 checks passed
@complexspaces
Copy link
Collaborator

Post-merge steps

  • Generate Android Maven artifacts locally N/A, no Android changes.
  • Create and push Git tag
  • cargo publish for each required crate, based on release steps
  • Create companion GitHub release

@complexspaces complexspaces deleted the jbp-prepare-0.1.2 branch August 23, 2024 19:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants