Re: [Xastir-dev] Auto-packaging

2019-04-22 Thread Curt Mills
That can be done as well, but most people want a .DEB or .RPM that they can install using their package tools. That's what most distributions want as well. On Mon, Apr 22, 2019 at 1:33 PM David Flood wrote: > Question from the Peanut Gallery... > > Do they have to be binary packages or can they

[Xastir-dev] Auto-packaging

2019-04-22 Thread Curt Mills
It's been suggested that our current method of having non-project people do packaging on an ad-hoc basis isn't working. Often the packages available in various Linux distributions are years old. I was thinking about how to make Travis-CI do auto-packaging of releases. It's possible, but the OS'es

Re: [Xastir-dev] Travis-CI / Branches / Git

2019-04-22 Thread Curt Mills
Cool. Yea I have those turned on for both of my github repo's. Looks like I have all the tools I need for now. On Mon, Apr 22, 2019 at 11:28 AM Tom Russo wrote: > Looking on https:travis-ci.com//Xastir/settings, there's a > "Build pushed branches" and "build pushed pull requests" setting that

[Xastir-dev] Travis-CI / Branches / Git

2019-04-22 Thread Curt Mills
The Travis-CI settings for a repo have a setting for building pushed branches and I have that enabled for my Github forks of Xastir and Xastir-Qt. Thinking about the workflow: If I work on a "warning-fixes" branch then want to push it to my Github fork to trigger Travis-CI, I'd push my branch up

Re: [Xastir-dev] Git question

2019-04-22 Thread km5vy Tom Russo
On Mon, Apr 22, 2019 at 09:37:09AM -0700, we recorded a bogon-computron collision of the flavor, containing: > $ git config -l > push.default=simple > user.name=Curt Mills, WE7U > color.ui=auto > core.whitespace=trailing-space,tab-in-indent,space-before-tab > core.autocrlf=input >

Re: [Xastir-dev] Git question

2019-04-22 Thread Curt Mills
On Mon, Apr 22, 2019 at 9:19 AM Tom Russo wrote: > git checkout master > git reset --hard upstream/master > git push --force origin master > Worked beautifully. What's even more important is that I understand what it did. -- Curt, WE7Uhttp://we7u.wetnet.net

Re: [Xastir-dev] Git question

2019-04-22 Thread Tom Russo
On Mon, Apr 22, 2019 at 09:25:56AM -0700, we recorded a bogon-computron collision of the flavor, containing: > On Mon, Apr 22, 2019 at 9:05 AM Jason Godfrey wrote: > > > Is origin Xastir/Xastir and upstream we7u/Xastir? > > In any case, I would probably try a git pull from origin > > > >

Re: [Xastir-dev] Git question

2019-04-22 Thread Curt Mills
$ git config -l push.default=simple user.name=Curt Mills, WE7U color.ui=auto core.whitespace=trailing-space,tab-in-indent,space-before-tab core.autocrlf=input branch.autosetuprebase=always branch.autosetupmerge=always merge.tool=tkdiff diff.tool=tkdiff difftool.prompt=false mergetool.prompt=false

Re: [Xastir-dev] Git question

2019-04-22 Thread Curt Mills
On Mon, Apr 22, 2019 at 9:05 AM Jason Godfrey wrote: > Is origin Xastir/Xastir and upstream we7u/Xastir? > In any case, I would probably try a git pull from origin > Other way around: I'm working in the we7u/Xastir fork so it is "origin". Xastir/Xastir is "upstream". In general I try to avoid

Re: [Xastir-dev] Git question

2019-04-22 Thread Tom Russo
On Mon, Apr 22, 2019 at 11:05:00AM -0500, we recorded a bogon-computron collision of the flavor, containing: > Is origin Xastir/Xastir and upstream we7u/Xastir? > In any case, I would probably try a git pull from origin upstream is Xastir/Xastir and origin is we7u/Xastir. > In general I try to

Re: [Xastir-dev] Git question

2019-04-22 Thread Tom Russo
Ok, I see what you have done. This is what I have (my "origin" remote is what you have as upstream: * 34f7373b (HEAD -> master, origin/master, origin/HEAD) Add dependent package * e7f47a88 Rename OSX build * 1247152f Fix overlooked unused result warning * 6e14f284 Silence used result warning *

Re: [Xastir-dev] Git question

2019-04-22 Thread Jason Godfrey
Is origin Xastir/Xastir and upstream we7u/Xastir? In any case, I would probably try a git pull from origin In general I try to avoid working in master. I will do work in another branch and have master track the "official" master. If needed I will update my local master and then merge master into