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

Update cargo-audit to v0.18.1 #20029

Merged
merged 1 commit into from
Sep 7, 2023
Merged

Update cargo-audit to v0.18.1 #20029

merged 1 commit into from
Sep 7, 2023

Conversation

rillian
Copy link
Contributor

@rillian rillian commented Sep 6, 2023

Work around a compatibility issue between our previous version and the chromium 117 rust toolchain, probably from incompatible nightly versions, but updating our vendored source to the latest release.

This is the contents of the published package downloaded and unpacked from https://crates.io/api/v1/crates/cargo-audit/0.18.1/download with the README.chromium updated manually.

We build this in CI with cargo, so updating other vendored deps is not necessary.

Resolves brave/brave-browser#32816

Submitter Checklist:

  • I confirm that no security/privacy review is needed and no other type of reviews are needed, or that I have requested them
  • There is a ticket for my issue
  • Used Github auto-closing keywords in the PR description above
  • Wrote a good PR/commit description
  • Squashed any review feedback or "fixup" commits before merge, so that history is a record of what happened in the repo, not your PR
  • Added appropriate labels (QA/Yes or QA/No; release-notes/include or release-notes/exclude; OS/...) to the associated issue
  • Checked the PR locally:
    • npm run test -- brave_browser_tests, npm run test -- brave_unit_tests wiki
    • npm run lint, npm run presubmit wiki, npm run gn_check, npm run tslint
  • Ran git rebase master (if needed)

Reviewer Checklist:

  • A security review is not needed, or a link to one is included in the PR description
  • New files have MPL-2.0 license header
  • Adequate test coverage exists to prevent regressions
  • Major classes, functions and non-trivial code blocks are well-commented
  • Changes in component dependencies are properly reflected in gn
  • Code follows the style guide
  • Test plan is specified in PR before merging

After-merge Checklist:

Test Plan:

Work around a compatibility issue between our previous version and
the chromium 117 rust toolchain, probably from incompatible nightly
versions, but updating our vendored source to the latest release.

This is the contents of the published package downloaded and unpacked
from https://crates.io/api/v1/crates/cargo-audit/0.18.1/download
with the README.chromium updated manually.

We build this in CI with cargo, so we updating other vendored deps
is not necessary.
@rillian rillian requested a review from a team as a code owner September 6, 2023 22:36
@rillian rillian self-assigned this Sep 6, 2023
@rillian rillian requested a review from a team as a code owner September 6, 2023 22:36
@github-actions github-actions bot added the CI/run-audit-deps Check for known npm/cargo vulnerabilities (audit_deps) label Sep 6, 2023
@rillian rillian enabled auto-merge September 6, 2023 23:45
@rillian rillian merged commit 61233ce into master Sep 7, 2023
@rillian rillian deleted the cargo-audit-0.18.1 branch September 7, 2023 00:29
@github-actions github-actions bot added this to the 1.60.x - Nightly milestone Sep 7, 2023
brave-builds added a commit that referenced this pull request Sep 7, 2023
mkarolin pushed a commit that referenced this pull request Sep 7, 2023
kjozwiak pushed a commit that referenced this pull request Sep 7, 2023
kjozwiak pushed a commit that referenced this pull request Sep 11, 2023
* Merge pull request #19398 from brave/cr117

Upgrade from Chromium 116 to Chromium 117

* Explicitly adding rust sources to BUILD.gn files.

This was done in the original cr117 PR, but this change is specific to
1.58.x branch rust sources.

Chromium change:
https://chromium.googlesource.com/chromium/src/+/eed02145256f53a0e85ffbb5bac4d567b625862a

commit eed02145256f53a0e85ffbb5bac4d567b625862a
Author: danakj <[email protected]>
Date:   Wed Jul 19 14:59:28 2023 +0000

    List all inputs to rust targets in GN and verify them during build

    RBE requires all inputs to be named in order for it to copy them to
    the remote build environment.

    GN analyze requires all inputs to be named in order to decide what
    needs to be rebuilt based on a list of modified files. The current GN
    analyze setup was supposed to do this as well, but it is not working.

    Have gnrt produce a list of all (possible) input files for 3p and
    stdlib crates so that it can be included in the generated BUILD.gn
    files.

    Then verify in rustc_wrapper.py that all inputs rustc reports are
    found in the GN rule's sources or inputs fields by comparing with the
    depfile produced from rustc.

    Bug: 1459444

* Merge pull request #20022 from brave/ios-cr117-build-fix

[iOS] Remove breaking `enable_arc` build configs

* Merge pull request #20029 from brave/cargo-audit-0.18.1

Update cargo-audit to v0.18.1

* IWYU fix.

* Upgrade from Chromium 117.0.5938.35 to Chromium 117.0.5938.48. (#20030)

* Upgrade from Chromium 117.0.5938.35 to Chromium 117.0.5938.48

* Upgrade patches from Chromium 117.0.5938.35 to Chromium 117.0.5938.48

* Update pins list timestamp

* Updated strings for Chromium 117.0.5938.48

---------

Co-authored-by: brave-builds <[email protected]>

* Merge pull request #20047 from brave/bugfix/ChromiumSessionRestore-iOS

[iOS] - Fix #32840: Disable Chromium Session-Restore for WebState and WebViews

---------

Co-authored-by: Kyle Hickinson <[email protected]>
Co-authored-by: Ralph Giles <[email protected]>
Co-authored-by: brave-builds <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
CI/run-audit-deps Check for known npm/cargo vulnerabilities (audit_deps)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

cargo-audit build fails with cr117 toolchain
2 participants