ArcticaProject / nx-libs

nx-libs
Other
119 stars 39 forks source link

Which repo to use for x2go? #1055

Closed Yetoo1 closed 1 year ago

Yetoo1 commented 1 year ago

Is this repo incorporating x2go specific fixes or is it standalone? I am unsure which repo to file bugs against or to pull from as the README.md suggests x2go and other developers stopped nx redistribution and ArcticaProject will consolidate efforts to a single place such as this repo. Despite this https://code.x2go.org/nx-libs is currently ahead in some commits and I see no branches here that mirror those. Guidance on this would be appreciated.

uli42 commented 1 year ago

Well, the idea is that Arctica is the main repo. Normally the x2go repo clones that from time to time, but I don't know how the package is handled there.

We should pull newer the commits from there. I have not been aware that there are newer ones. Normal flow is to add PRs here which has not been done - for whatever reason.

On Tue, Apr 25, 2023 at 7:57 PM Yetoo1 @.***> wrote:

Is this repo incorporating x2go specific fixes or is it standalone? I am unsure which repo to file bugs against or to pull from as the README.md suggests x2go and other developers stopped nx redistribution and ArctiaProject will consolidate efforts to a single place such as this repo. Despite this https://code.x2go.org/nx-libs is currently ahead in some commits and I see no branches here that mirror those. Guidance on this would be appreciated.

— Reply to this email directly, view it on GitHub https://github.com/ArcticaProject/nx-libs/issues/1055, or unsubscribe https://github.com/notifications/unsubscribe-auth/ABQHBZGSG76VROJG6IQBXXLXDAF7FANCNFSM6AAAAAAXLK6SKI . You are receiving this because you are subscribed to this thread.Message ID: @.***>

sunweaver commented 1 year ago

@uli42: I have now pulled @Ionic's changes in x2go/nx-libs#master over to gh/nx-libs#3.6.x.

@Yetoo1 Thanks for noticing this...

uli42 commented 1 year ago

Thanks! What about the other PRs?

On Thu, Apr 27, 2023 at 10:29 AM Mike Gabriel @.***> wrote:

@uli42: I have now pulled @Ionic's changes in x2go/nx-libs#master over to gh/nx-libs#3.6.x.

@Yetoo1 Thanks for noticing this...

— Reply to this email directly, view it on GitHub, or unsubscribe. You are receiving this because you were mentioned.Message ID: @.***>

sunweaver commented 1 year ago

To answer the original question: This repo, branch 3.6.x is upstream for X2Go. nx-libs code found at code.x2go.org is downstream. @Ionic: you added patches to the master branch which you hadn't upstreamed, so far. Please let's keep this and the X2Go nx-libs repo in sync by adding new changes here first and then pulling the 3.6.x branch downstream. Thanks.

@uli42 I have looked at some other PRs, will continue after #1045 has finished CI and confirmed that all is green again/still.

realsimix commented 1 year ago

Distribution packages are usually stuck at version 3.5.99.26, which is quite old.

I was wondering if it wouldn't make sense to do a release version 3.5.99.27 anytime soon?

uli42 commented 1 year ago

+1

On Fri, Apr 28, 2023 at 10:28 AM Simon Matter @.***> wrote:

Distribution packages are usually stuck at version 3.5.99.26, which is quite old.

I was wondering if it wouldn't make sense to do a release version 3.5.99.27 anytime soon?

— Reply to this email directly, view it on GitHub https://github.com/ArcticaProject/nx-libs/issues/1055#issuecomment-1527184148, or unsubscribe https://github.com/notifications/unsubscribe-auth/ABQHBZD6BSMKABET3C43IULXDN5TNANCNFSM6AAAAAAXLK6SKI . You are receiving this because you were mentioned.Message ID: @.***>

Ionic commented 1 year ago

Sorry, I've had to add a few commits to unbreak builds on newer OpenSuSE versions quickly for X2Go. The changes were merely build-related and I had to get nightly builds working. I slacked on pushing them upstream and was thinking of how to do that anyway without having to rebase the X2Go master branch.

sunweaver commented 1 year ago

@Ionic: I now (i.e. yesterday) pushed your changes to the 3.6.x branch, nothing should be needed to be rebase.