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

mail-client/bower: bump to version 0.11 #13143

Closed
wants to merge 2 commits into from
Closed

mail-client/bower: bump to version 0.11 #13143

wants to merge 2 commits into from

Conversation

rseichter
Copy link
Contributor

Upstream release 0.11.

@gentoo-bot
Copy link

Pull Request assignment

Submitter: @rseichter
Areas affected: ebuilds
Packages affected: mail-client/bower

mail-client/bower: @rseichter, @gentoo/proxy-maint

Linked bugs

Bugs linked: 696198


In order to force reassignment and/or bug reference scan, please append [please reassign] to the pull request title.

Docs: Code of ConductCopyright policy (expl.) ● DevmanualGitHub PRsProxy-maint guide

@gentoo-bot gentoo-bot added self-maintained The PR changes only packages that are maintained by the submitter (i.e. no need to ask anybody else) assigned PR successfully assigned to the package maintainer(s). bug linked Bug/Closes found in footer, and cross-linked with the PR. labels Oct 4, 2019
@juippis
Copy link
Member

juippis commented Oct 7, 2019

Noo don't use git mv but make a fresh copy of a file, and delete the previous in a separate commit.

@rseichter
Copy link
Contributor Author

I did not actually use git mv, but I did squash my commits. Apparently Git decided to represent this as a rename operation, which is understandable, given that the file contents are identical.

@juippis
Copy link
Member

juippis commented Oct 10, 2019

There's something one of us isnt seeing here. To me, it looks like the old file gets deleted (check Manifest file) and new one isn't identical (like, DESCRIPTION changes and COMMON_DEPEND introduced). If this is truly the case, could you split the commit into two? Or is my Github view somehow messing it up... I only see one commit.

@rseichter
Copy link
Contributor Author

I squashed two commits because I forgot to remove the "A" in DESCRIPTION in the first commit. I did not introduce COMMON_DEPEND in 0.11. GitHub just seems to be confused, presenting diffs between obsolete ebuild 0.9 and 0.11 instead of 0.10 and 0.11. Here is what diff shows me:

$ diff bower-0.10.ebuild bower-0.11.ebuild
8c8
< DESCRIPTION="A curses terminal client for the Notmuch email system"
---
> DESCRIPTION="Curses terminal client for the Notmuch email system"
14c14
< KEYWORDS="amd64"
---
> KEYWORDS="~amd64"

So, the only difference between 0.10 (stable) and 0.11 are KEYWORDS and the article "A" in the description. I don't see what I could do to de-confuse GitHub.

@juippis
Copy link
Member

juippis commented Oct 16, 2019

git reset --hard HEAD~1
wget https://raw.githubusercontent.com/gentoo/gentoo/8a2af298fc3fbbaed3a83fe651f7d34dbbeaea54/mail-client/bower/bower-0.11.ebuild
repoman manifest
git add Manifest bower-0.11.ebuild
repoman ci
git rm bower-0.9.ebuild
repoman manifest
git add Manifest
repoman ci
git push

Note that repoman ci generates and commits the Manifest file, but I really use it for automated cat/pkg: messages.

All in all you want to do:

vim newfile.ebuild
generate manifest
git add Manifest newfile.ebuild
git commit
git rm oldfile.ebuild
generate manifest
git add Manifest
git commit
git push

so in the end there will be 2 logical commits.

Closes: https://bugs.gentoo.org/696198
Package-Manager: Portage-2.3.76, Repoman-2.3.16
Signed-off-by: Ralph Seichter <gentoo@seichter.de>
Package-Manager: Portage-2.3.76, Repoman-2.3.16
Signed-off-by: Ralph Seichter <gentoo@seichter.de>
@rseichter
Copy link
Contributor Author

Looks OK to me now, thanks for the pointers. In the future, I need to be more selective about when and when not to squash commits.

@gentoo-repo-qa-bot
Copy link
Collaborator

Pull request CI report

Report generated at: 2019-10-18 15:19 UTC
Newest commit scanned: bc81d15
Status: ✅ good

Issues already there before the PR (double-check them):
https://qa-reports.gentoo.org/output/gentoo-ci/3322741/output.html#net-libs/nodejs
https://qa-reports.gentoo.org/output/gentoo-ci/3322741/output.html#sci-mathematics/kodkod

@juippis
Copy link
Member

juippis commented Oct 21, 2019

Thanks!

 * QA Notice: Package triggers severe warnings which indicate that it
 *            may exhibit random runtime failures.
 * curs.m:772:10: warning: implicit declaration of function ‘get_wch’; did you mean ‘getwc’? [-Wimplicit-function-declaration]
 * Please do not file a Gentoo bug and instead report the above QA
 * issues directly to the upstream developers of this software.
 * Homepage: https://github.com/wangp/bower

if you havent already, this should be reported to upstream.

@rseichter rseichter deleted the bower-0.11 branch October 21, 2019 14:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
assigned PR successfully assigned to the package maintainer(s). bug linked Bug/Closes found in footer, and cross-linked with the PR. self-maintained The PR changes only packages that are maintained by the submitter (i.e. no need to ask anybody else)
Projects
None yet
4 participants