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

Merge target/master #19

Merged
merged 31 commits into from
Mar 7, 2022
Merged

Merge target/master #19

merged 31 commits into from
Mar 7, 2022

Conversation

cameron-dunn-sublime
Copy link
Member

Specifically to get target#197 but grabs some other fixes.

Merged with -s ours to resolve conflicts on go.sum/go.mod files (aka we may be out of date here). These occur because this repo has go deps setup differently.

phutelmyer and others added 30 commits November 29, 2021 08:48
Bumps [lxml](https://github.com/lxml/lxml) from 4.6.3 to 4.6.5.
- [Release notes](https://github.com/lxml/lxml/releases)
- [Changelog](https://github.com/lxml/lxml/blob/master/CHANGES.txt)
- [Commits](lxml/lxml@lxml-4.6.3...lxml-4.6.5)

---
updated-dependencies:
- dependency-name: lxml
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>
…/backend/lxml-4.6.5

Bump lxml from 4.6.3 to 4.6.5 in /build/python/backend
* Twice we've seen a build w/ JTR apparently unstable.
  * It's unclear if this is a build issue, or a result of grabbing
a bad version (as we were just grabbing the repo head).
  * This ensures we grab the same commit, so if we continue to see
issues we can go from there.
  * There are no even halfway recent tags so the commit is arbitrary.
* Also changes the repo from magnumripper/JohnTheRipper to openwall/john
as that's where the old repo forwards to.
* And grab a single commit to speed things up (239 MB -> 140 ish MB).
Bumps [numpy](https://github.com/numpy/numpy) from 1.20.2 to 1.21.0.
- [Release notes](https://github.com/numpy/numpy/releases)
- [Changelog](https://github.com/numpy/numpy/blob/main/doc/HOWTO_RELEASE.rst.txt)
- [Commits](numpy/numpy@v1.20.2...v1.21.0)

---
updated-dependencies:
- dependency-name: numpy
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>
…/backend/numpy-1.21.0

Bump numpy from 1.20.2 to 1.21.0 in /build/python/backend
…ve-library

Install Archive library for ExifTools
@cameron-dunn-sublime cameron-dunn-sublime requested a review from a team March 7, 2022 17:18
@cameron-dunn-sublime cameron-dunn-sublime marked this pull request as draft March 7, 2022 18:02
@cameron-dunn-sublime cameron-dunn-sublime marked this pull request as ready for review March 7, 2022 21:36
@cameron-dunn-sublime cameron-dunn-sublime merged commit 383b97f into main Mar 7, 2022
@cameron-dunn-sublime cameron-dunn-sublime deleted the cd.merge-target branch March 7, 2022 21:36
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.

4 participants