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

Add new root keys #9068

Merged
merged 2 commits into from
Jul 1, 2023
Merged

Conversation

david-christiansen
Copy link
Contributor

@david-christiansen david-christiansen commented Jun 27, 2023

Hackage Security has gotten two new root keyholders. This PR adds them to the bootstrap set. They're not in the currently-deployed root.json, but I'm in the process of getting that file ready to go (this is part of that process).

The correctness of this PR can be checked against https://github.com/haskell-infra/hackage-root-keys/tree/master/root-keys.

See #8669 for a prior MR in this series. The final comment in that thread mentions getting new root keyholders - this is the realization of that.


Please include the following checklist in your PR:

Bonus points for added automated tests!

david-christiansen added a commit to david-christiansen/cabal that referenced this pull request Jun 27, 2023
@david-christiansen
Copy link
Contributor Author

I don't think the docs need updating, and this doesn't change the CLI.

Copy link
Collaborator

@ulysses4ever ulysses4ever left a comment

Choose a reason for hiding this comment

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

LGTM, thanks!

Copy link
Collaborator

@andreabedini andreabedini left a comment

Choose a reason for hiding this comment

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

👍🗝️

@andreabedini andreabedini added merge me Tell Mergify Bot to merge and removed attention: needs-review labels Jun 27, 2023
@Mikolaj
Copy link
Member

Mikolaj commented Jun 28, 2023

Let me set up a backport for @Kleidukos to approve (or not).

@Mikolaj
Copy link
Member

Mikolaj commented Jun 28, 2023

@mergify backport 3.10

@mergify
Copy link
Contributor

mergify bot commented Jun 28, 2023

backport 3.10

✅ Backports have been created

@Kleidukos
Copy link
Member

Yep it's going in

@mergify mergify bot added the merge delay passed Applied (usually by Mergify) when PR approved and received no updates for 2 days label Jun 30, 2023
@ulysses4ever
Copy link
Collaborator

@mergify rebase

@mergify
Copy link
Contributor

mergify bot commented Jul 1, 2023

rebase

✅ Branch has been successfully rebased

@mergify mergify bot merged commit 7955704 into haskell:master Jul 1, 2023
43 checks passed
mergify bot pushed a commit that referenced this pull request Jul 1, 2023
(cherry picked from commit 7006704)
ulysses4ever added a commit that referenced this pull request Jul 12, 2023
Add new root keys

(cherry picked from commit 7436f8f)

# Conflicts:
#	cabal-install/src/Distribution/Client/Config.hs

* Add CHANGELOG entry for PR #9068

(cherry picked from commit 7006704)

* Fix conflict
mergify bot added a commit that referenced this pull request Jul 12, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merge delay passed Applied (usually by Mergify) when PR approved and received no updates for 2 days merge me Tell Mergify Bot to merge
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants