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

New package: flavours-0.6.1 #41310

Merged
merged 1 commit into from Jun 24, 2023
Merged

Conversation

Newchair2644
Copy link
Contributor

Testing the changes

  • I tested the changes in this PR: YES

New package

Local build testing

  • I built this PR locally for my native architecture, (x86_64, glibc)

@Newchair2644
Copy link
Contributor Author

On my machine, I did run xlint on the first commit that used $wrksrc, but it didn't catch any errors. I ran xlint srcpkgs/flavours/template and common/travis/xlint.sh srcpkgs/flavours/template, but neither caught the mistake. My master branch was up to date with upstream. Please let me know what I am doing wrong, would appreciate (this is my first package). Thank you!

@paper42 paper42 added the new-package This PR adds a new package label Dec 27, 2022
@paper42
Copy link
Member

paper42 commented Dec 27, 2022

CI uses the newest xlint, on your system you probably have the xlint from the last xtools release.

@paper42
Copy link
Member

paper42 commented Dec 27, 2022

please squash the commits

@Newchair2644
Copy link
Contributor Author

I made a mess! Sorry I know you have better things to do than teach me how to git but I'm not sure how to do this. I tried to run git rebase -i HEAD~2 but it gave me this output:

error: cannot 'squash' without a previous commit
You can fix this with 'git rebase --edit-todo' and then run 'git rebase --continue'.
Or you can abort the rebase with 'git rebase --abort'.

So for some reason I decided it was a good idea to merge master and this was the result. Sorry about this!

@Newchair2644
Copy link
Contributor Author

Okay so I reverted the branch back to my last commit with git reset 1aaa6853bb8363cb5d7917ee86074683f8882c7b and git push --force but I am still getting the same error when I try to squash the commits.

flavours: remove $wrksrc and edit $distfiles to use $homepage
@Newchair2644
Copy link
Contributor Author

Newchair2644 commented Dec 27, 2022

Nevermind I figured it out. I was using squash on both commits when I should have been using pick on the first commit and squash on the second. Such a simple thing I managed to almost mess up so badly lol. Good thing git revert exists!

@github-actions
Copy link

Pull Requests become stale 90 days after last activity and are closed 14 days after that. If this pull request is still relevant bump it or assign it.

@github-actions github-actions bot added the Stale label Mar 28, 2023
@Newchair2644
Copy link
Contributor Author

Is there anything preventing this PR from being merged? I noticed it has become stale.

@paper42
Copy link
Member

paper42 commented Apr 7, 2023

from me, my lack of interest in this package, but I can't speak for other maintainers

@github-actions github-actions bot removed the Stale label Apr 8, 2023
@Anachron
Copy link
Contributor

Anachron commented Jun 6, 2023

I am using this package for a week now without issues.
In fact, I believe the quality should suffice to be included.

@Duncaen Duncaen merged commit ee601aa into void-linux:master Jun 24, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
new-package This PR adds a new package
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants