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.

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

Jump to bottom

update Cargo.lock file #1098

Merged
merged 1 commit into from
Dec 16, 2024
Merged

update Cargo.lock file #1098

merged 1 commit into from
Dec 16, 2024

Conversation

sam0x17
Copy link
Contributor

@sam0x17 sam0x17 commented Dec 16, 2024 •
edited
Loading

somehow testnet / main had local Cargo.lock changes. In the future CI should check for this

@sam0x17 sam0x17 requested a review from unconst as a code owner December 16, 2024 22:04
@github-actions github-actions bot added the hotfix This PR needs to be merged very quickly and will likely skip testing on devnet and testnet label Dec 16, 2024
@github-actions GitHub Actions
Copy link

github-actions bot commented Dec 16, 2024 •
edited by sam0x17
Loading

🚨🚨🚨 HOTFIX DETECTED 🚨🚨🚨

It looks like you are trying to merge a hotfix PR into main. If this isn't what you wanted to do, and you just wanted to make a regular PR, please close this PR, base your changes off the devnet-ready branch and open a new PR into devnet ready.

If you are trying to merge a hotfix PR, please complete the following essential steps:

  1. go ahead and get this PR into main merged, so we can get the change in as quickly as possible!
  2. merge main into testnet, bumping spec_version
  3. deploy testnet
  4. merge testnet into devnet, bumping spec_version
  5. deploy devnet
  6. merge devnet into devnet-ready

If you do not complete these steps, your hotfix may be inadvertently removed in the future when branches are promoted to main, so it is essential that you do so.

@sam0x17 sam0x17 self-assigned this Dec 16, 2024
@sam0x17 sam0x17 added the no-spec-version-bump PR does not contain changes that requires bumping the spec version label Dec 16, 2024
@sam0x17
Copy link
Contributor Author

sam0x17 commented Dec 16, 2024

spec version does not need to bump for this

@sam0x17 sam0x17 added the skip-cargo-audit This PR fails cargo audit but needs to be merged anyway label Dec 16, 2024
@unconst unconst merged commit 2050251 into main Dec 16, 2024
22 of 23 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@JohnReedV JohnReedV JohnReedV approved these changes

@unconst unconst unconst approved these changes

@camfairchild camfairchild camfairchild approved these changes

Assignees

@sam0x17 sam0x17

Labels
hotfix This PR needs to be merged very quickly and will likely skip testing on devnet and testnet no-spec-version-bump PR does not contain changes that requires bumping the spec version skip-cargo-audit This PR fails cargo audit but needs to be merged anyway
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@sam0x17 @camfairchild @unconst @JohnReedV