gambas-devel

[Gambas-devel] GitLab and PPAs

[Sebastián K. <se...@gm...>]

Hi everyone!

Sorry for the delay in getting into this, I just got back from an exchange
semester.

This week I moved the building infrastructure of the PPAs from the SVN repo
to the git repo, but I had some problems in the way. First of all, the
stable branch in gitlab is not actually the same as the released source
archive for Gambas 3.10.0.

For everything to work, I would need to have in the stable branch the same
code as in the source archive. Right now, I can't speak on the source
itself, but the version numbers at least correspond to a developing branch,
not to a stable one.

I have already pushed builds to the three PPAs, to the stable one without
knowing I would have this problem. I don't have access to the gitlab
project to change it myself, so please update the version numbers as soon
as possible. If there is any difference from the released source archive,
that should also be fixed ASAP so that I can issue a new build.

Thanks for the help, and sorry again for the delay.

Regards,
Sebastian

Re: [Gambas-devel] GitLab and PPAs

[Benoît M. <ga...@us...>]

Le 24/08/2017 à 20:46, Sebastián Kulesz a écrit :
> Hi everyone!
> 
> Sorry for the delay in getting into this, I just got back from an 
> exchange semester.
> 
> This week I moved the building infrastructure of the PPAs from the SVN 
> repo to the git repo, but I had some problems in the way. First of all, 
> the stable branch in gitlab is not actually the same as the released 
> source archive for Gambas 3.10.0.
> 
> For everything to work, I would need to have in the stable branch the 
> same code as in the source archive. Right now, I can't speak on the 
> source itself, but the version numbers at least correspond to a 
> developing branch, not to a stable one.

"stable" is the equivalent of "/branches/3.10". To get the 3.10.0 code, 
you must look at the "3.10.0" tag.

Anyway I will fix the "stable" version with "3.10.0".

Regards,

-- 
Benoît Minisini

Re: [Gambas-devel] GitLab and PPAs

[Christof T. <ch...@de...>]

Am 24.08.2017 um 21:35 schrieb Benoît Minisini via Gambas-devel:

>> For everything to work, I would need to have in the stable branch the 
>> same code as in the source archive. Right now, I can't speak on the 
>> source itself, but the version numbers at least correspond to a 
>> developing branch, not to a stable one.
> 
> "stable" is the equivalent of "/branches/3.10". To get the 3.10.0 code, 
> you must look at the "3.10.0" tag.
> 
> Anyway I will fix the "stable" version with "3.10.0".

On launchpad now there is a version called 3.10.0 whithout the fixes you
made before releasing 3.10.0

You asked for a last test, I reported, you fixed:

b2901f7d41e35b "[DEVELOPMENT ENVIRONMENT] * BUG: Editor: Fix identation
of code beautifier on lines ending with an operator and on strings
spread over multiple lines."

I now tested 3.10.0 from launchpad, it scrambles my code over and over
... because this fix is not in it.

Maybe the tag v3.10.0 is set to the wrong commit? It should have been set to

8cd2dba1d4f1169676 ...

But it is at this commit:
bd1b84afcdafd1961d50b0f809c45eecca5b90eb

So it lacks the last fixes ...


Alles Gute

Christof Thalhofer

-- 
Dies ist keine Signatur

Re: [Gambas-devel] GitLab and PPAs

[Benoît M. <ga...@us...>]

Le 26/08/2017 à 19:34, Christof Thalhofer a écrit :
> Am 24.08.2017 um 21:35 schrieb Benoît Minisini via Gambas-devel:
> 
>>> For everything to work, I would need to have in the stable branch the
>>> same code as in the source archive. Right now, I can't speak on the
>>> source itself, but the version numbers at least correspond to a
>>> developing branch, not to a stable one.
>>
>> "stable" is the equivalent of "/branches/3.10". To get the 3.10.0 code,
>> you must look at the "3.10.0" tag.
>>
>> Anyway I will fix the "stable" version with "3.10.0".
> 
> On launchpad now there is a version called 3.10.0 whithout the fixes you
> made before releasing 3.10.0
> 
> You asked for a last test, I reported, you fixed:
> 
> b2901f7d41e35b "[DEVELOPMENT ENVIRONMENT] * BUG: Editor: Fix identation
> of code beautifier on lines ending with an operator and on strings
> spread over multiple lines."
> 
> I now tested 3.10.0 from launchpad, it scrambles my code over and over
> ... because this fix is not in it.
> 
> Maybe the tag v3.10.0 is set to the wrong commit? It should have been set to
> 
> 8cd2dba1d4f1169676 ...
> 
> But it is at this commit:
> bd1b84afcdafd1961d50b0f809c45eecca5b90eb
> 
> So it lacks the last fixes ...
> 
> 
> Alles Gute
> 
> Christof Thalhofer
> 

Yep. Apparently the git tag missed the three last commits of the final 
3.10.0. I think I have to add them to the stable branch too.

-- 
Benoît Minisini

Re: [Gambas-devel] GitLab and PPAs

[Christof T. <ch...@de...>]

Am 26.08.2017 um 21:43 schrieb Benoît Minisini:

> Yep. Apparently the git tag missed the three last commits of the
> final 3.10.0. I think I have to add them to the stable branch too.

There is no stable branch, just a tag called v3.10.0.

I think it makes sense to create a branch called v3.10.1 and cherry-pick
the fixes into it.

So:

git branch v.3.10.1
git checkout v.3.10.1
git cherry-pick 954f3ff7069e55
git cherry-pick b2901f7d41e35b
git cherry-pick 8cd2dba1d4f116

Then the branch has to be pushed upstream

git push -u origin v3.10.1

AFAIK

Alles Gute

Christof Thalhofer

-- 
Dies ist keine Signatur

Re: [Gambas-devel] GitLab and PPAs

[Benoît M. <ga...@us...>]

Le 26/08/2017 à 22:58, Christof Thalhofer a écrit :
> Am 26.08.2017 um 21:43 schrieb Benoît Minisini:
> 
>> Yep. Apparently the git tag missed the three last commits of the
>> final 3.10.0. I think I have to add them to the stable branch too.
> 
> There is no stable branch, just a tag called v3.10.0.
> 
> I think it makes sense to create a branch called v3.10.1 and cherry-pick
> the fixes into it.
> 
> So:
> 
> git branch v.3.10.1
> git checkout v.3.10.1
> git cherry-pick 954f3ff7069e55
> git cherry-pick b2901f7d41e35b
> git cherry-pick 8cd2dba1d4f116
> 
> Then the branch has to be pushed upstream
> 
> git push -u origin v3.10.1
> 
> AFAIK
> 
> Alles Gute
> 
> Christof Thalhofer
> 

By the way, I'm currently thinking that the easier and the better may be 
a 3.11 very fast, as soon as the TerminalView and process management is 
stabilized (it seems now). Because there are far more than these 3 fixed 
to merge.

Regards,

-- 
Benoît Minisini

Re: [Gambas-devel] GitLab and PPAs

[Christof T. <ch...@de...>]

Am 26.08.2017 um 23:21 schrieb Benoît Minisini:

> By the way, I'm currently thinking that the easier and the better may be 
> a 3.11 very fast, as soon as the TerminalView and process management is 
> stabilized (it seems now). Because there are far more than these 3 fixed 
> to merge.

No problem, I would stay at 3.9 till then ...


Alles Gute

Christof Thalhofer

-- 
Dies ist keine Signatur

Re: [Gambas-devel] GitLab and PPAs

[PICCORO M. L. <mck...@gm...>]

Git uses two main types of tags: lightweight and annotated.  Gitlab had
predefined lightweithg and github annotated..

how are this doing by administrations?

Lenz McKAY Gerardo (PICCORO)
http://qgqlochekone.blogspot.com

2017-08-26 18:01 GMT-04:00 Christof Thalhofer <ch...@de...>:

> Am 26.08.2017 um 23:21 schrieb Benoît Minisini:
>
> > By the way, I'm currently thinking that the easier and the better may be
> > a 3.11 very fast, as soon as the TerminalView and process management is
> > stabilized (it seems now). Because there are far more than these 3 fixed
> > to merge.
>
> No problem, I would stay at 3.9 till then ...
>
>
> Alles Gute
>
> Christof Thalhofer
>
> --
> Dies ist keine Signatur
>
>
> ------------------------------------------------------------
> ------------------
> Check out the vibrant tech community on one of the world's most
> engaging tech sites, Slashdot.org! http://sdm.link/slashdot
> _______________________________________________
> Gambas-devel mailing list
> Gam...@li...
> https://lists.sourceforge.net/lists/listinfo/gambas-devel
>
>