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

cfonts: update to 1.0.4 #15130

Merged
merged 1 commit into from
Jun 19, 2022
Merged

Conversation

dominikwilkowski
Copy link
Contributor

Description

Update to cfonts.

Type(s)
  • bugfix
  • enhancement
  • security fix
Tested on

macOS 12.4 21F79 arm64
Command Line Tools 13.4.0.0.1.1651278267

Verification

Have you

@macportsbot
Copy link

Notifying maintainers:
@dominikwilkowski for port cfonts.

@herbygillot
Copy link
Member

herbygillot commented Jun 17, 2022

Your port defines a cargo.crates section, generated most likely using cargo2port off of your project's Cargo.lock file. You've updated the software version, but perhaps you also need to regenerate your cargo.crates from your new version's Cargo.lock?

If this is not done, but crates were updated in your new version, cargo will fail as it won't find the version of crates that Cargo.lock is telling it to expect.

This PR seems to have failed building in CI for that reason.

@dominikwilkowski
Copy link
Contributor Author

Thanks for the help @herbygillot
I also ran git rebase -i HEAD~2 to squash the two commits.
Not sure that worked.

@herbygillot
Copy link
Member

Thanks for the help @herbygillot
I also ran git rebase -i HEAD~2 to squash the two commits.
Not sure that worked.

It doesn't look like it did. If you look at the PR, you will see that it still lists 2 commits.

When you run rebase -i, you'll be presented with a text editor listing the 2 commits. You will want to change the directive for the previous commit from pick to squash. When you save and exit, you may be presented with another editor window where you can set the commit message for the new squashed commit. Set it as per MacPorts guidelines (cfonts: update to ...). After doing this, a git log should show you just a single commit on top of the master branch. Force push afterwards.

@dominikwilkowski
Copy link
Contributor Author

Thanks @herbygillot
I had done all of that but not force pushed ;)
history re-written

@herbygillot herbygillot merged commit d4145d3 into macports:master Jun 19, 2022
@herbygillot
Copy link
Member

Thanks @dominikwilkowski

@dominikwilkowski dominikwilkowski deleted the cfons_update branch June 19, 2022 22:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Development

Successfully merging this pull request may close these issues.

3 participants