Shared repository?
- mwm
- Topic Author
- Offline
In order to deal with this, I've created a team on bitbucket and cloned a copy of PhracturedBlue's repository into it .
My hope is that the people whose repos I'm trying to keep track of will start merging changes into this. I'll be doing that with mine very soon. If you're interested in doing so, please pm me here with your bitbucket id.
And yes, if PhraccturedBlue asks, I'll definitely turn the team & repos over to him!
Edit PB: I have agreed that mwm's repo is now the primary source code, and the nightly autobuilder will build from here. Downloads are available here:
www.deviationtx.com/downloads-new/category/13-nightly-builds
Do not ask me questions via PM. Ask in the forums, where I'll answer if I can.
My remotely piloted vehicle ("drone") is a yacht.
Please Log in or Create an account to join the conversation.
- Indigo
- Offline
- Posts: 230
If I understand you correctly, you want completed changes merged into a group repository: deviationtx / deviation
Please Log in or Create an account to join the conversation.
- hexfet
- Offline
- Posts: 1891
I'm not too familiar with mercurial. How should we push changes?
What do you think about keeping this repo consistent with the pull requests on PB's repo? It would be good to have a place to get a build that should be similar to the next official release.
Along that line, is there a way on bitbucket to pull a repo's pull requests to your local fork? On github pull requests can be pulled with git, but the closest thing I've found on bitbucket is the api to get a pull request as a patch ( example ).
Please Log in or Create an account to join the conversation.
- mwm
- Topic Author
- Offline
I've written documentation on how to add pull requests to Bitbucket repositories. It can be downloaded from this thread .
I covered - or think I did - your two questions in the Advanced topics section of that introduction. There are instructions for how to create the same pull request in both repositories with your changes in them. The only way I know of to copy a pull request to a Bitbucket repository is via a pull to your local copy then a push back to it.
Do not ask me questions via PM. Ask in the forums, where I'll answer if I can.
My remotely piloted vehicle ("drone") is a yacht.
Please Log in or Create an account to join the conversation.
- mwm
- Topic Author
- Offline
Do not ask me questions via PM. Ask in the forums, where I'll answer if I can.
My remotely piloted vehicle ("drone") is a yacht.
Please Log in or Create an account to join the conversation.
- victzh
- Offline
- Posts: 1386
Please Log in or Create an account to join the conversation.
- mwm
- Topic Author
- Offline
General rules: please submit a pull request for a review from your own clone before committing. Get approval from at least one other team member before merging. You might also do a pull on the team repository before merging, just to see if there's a change that might break the build.
Take some time to review pull requests yourself. The idea is to avoid problems - if you spot a bug, or there's a faster or smaller way to do something, comment. But don't bikeshed: if you make a suggestion and the person explains why they don't accept it, if you can't spot a flaw in their explanation, approve the code as is. They are donating it and will be the person hg blames and presumably the first person queried if there's a problem, so let them do it their way. If it really bothers you, write your own version of the pull request so hg blames you.
These are open for discussion.
Do not ask me questions via PM. Ask in the forums, where I'll answer if I can.
My remotely piloted vehicle ("drone") is a yacht.
Please Log in or Create an account to join the conversation.
- victzh
- Offline
- Posts: 1386
Please Log in or Create an account to join the conversation.
- victzh
- Offline
- Posts: 1386
I know that you are not an admin of this forum, but something should be done, otherwise people will lose interest to the project.
Please Log in or Create an account to join the conversation.
- victzh
- Offline
- Posts: 1386
Please Log in or Create an account to join the conversation.
- mwm
- Topic Author
- Offline
team deviationTx/deviation wiki: now points to the nightly builds on the drive, and has info for developers.
team deviationTx/deviation README now points people to the wiki for nightly builds and developer info.
PhracturedBlue/deviation Wiki home page now points to the team deviationTx/deviation repository.
Those are all the things I know I can update. I don't know anyone who can update the deviationtx.com site, other than via forum posts.
Do not ask me questions via PM. Ask in the forums, where I'll answer if I can.
My remotely piloted vehicle ("drone") is a yacht.
Please Log in or Create an account to join the conversation.
- mwm
- Topic Author
- Offline
victzh wrote: Can I edit the deviationtx/deviation/wiki/Home page to add information on nightly builds?
Not anymore, because it's already there. But yes, please feel free to update the wiki (or the README) as you feel appropriate.
Do not ask me questions via PM. Ask in the forums, where I'll answer if I can.
My remotely piloted vehicle ("drone") is a yacht.
Please Log in or Create an account to join the conversation.
- mwm
- Topic Author
- Offline
Do not ask me questions via PM. Ask in the forums, where I'll answer if I can.
My remotely piloted vehicle ("drone") is a yacht.
Please Log in or Create an account to join the conversation.
- victzh
- Offline
- Posts: 1386
Please Log in or Create an account to join the conversation.
- vlad_vy
- Offline
- Posts: 3333
Who will takes full responsibility for the project?
Please Log in or Create an account to join the conversation.
- mwm
- Topic Author
- Offline
The "team" repository is just that: an attempt to get all the people continuing development working together. The rules are pretty minimal, and designed to make it easy for PBR to evaluate when he comes back. I'm hoping PBR will adopt the code, but do it by just moving his work to it, rather than keeping the repository closed. He's already an admin on the repository.
I run the team project because I created the team & repositories. I'm inclusive about things: if you've had pull requests accepted by PBR or the team and agree to follow the rules on the team repository wiki page , you can have a commit bit.
However, I only have that authority because I created the repositories. If the team decides they want someone else to run it, or a more democratic process, or a different set of rules, I'll follow the teams wishes. And of course, PBR will always have the last say.
The other thing I'm doing to try and keep the project alive is the deviationTx foundation. That's still a proposal for a non-profit organization that would take over administering the project, among other things. But if nobody is interested, it won't happen. So if you'd like to see something set up that could accept donations to help develop deviationTx (again, among other things), make a comment on that thread .
Do not ask me questions via PM. Ask in the forums, where I'll answer if I can.
My remotely piloted vehicle ("drone") is a yacht.
Please Log in or Create an account to join the conversation.
- MacGyverek
- Offline
- Posts: 68
Please Log in or Create an account to join the conversation.
- mwm
- Topic Author
- Offline
I could tell you how to set up a VM to run those on, but frankly, it's probably easier to set up things to build them yourself. And running the emulator on a VM isn't very pleasant, which is why I changed build platforms.
So I'll look into getting windows binaries built, but I'm willing to help you do either of the above if you want.
Do not ask me questions via PM. Ask in the forums, where I'll answer if I can.
My remotely piloted vehicle ("drone") is a yacht.
Please Log in or Create an account to join the conversation.
- jesmail
- Offline
- Posts: 56
someone else asked about the elf file. I was trying to figure out what I was missing. Anyway look forward to see the windows binaries when they are ready.
Please Log in or Create an account to join the conversation.
- PhracturedBlue
- Offline
- Posts: 4402
if($build) {
printf("building...\n");
my $opts = "";
$opts = "INCLUDE_FS=1" if(1 || $version);
system("make distclean; rm *.zip 2>/dev/null");
if(system("make $opts release")) {
die "Failed to build release\n";
}
foreach my $target ("emu_devo8", "emu_devo10", "emu_devo7e", "emu_devo12") {
if(system("make TARGET=$target $opts WINDOWS=1 CROSS=i586-mingw32msvc- zip")) {
die "Failed to build $target\n";
}
}
}
I also need to build fltk and portaudio for windows to have those available. After that it 'just works'
How do you run the build-deamon? I noticed a Jenkins key, do you use this as part of the build? I only have my home server available for auto-builds, not anything I can share.
Please Log in or Create an account to join the conversation.
- Home
- Forum
- Development
- Development
- Shared repository?