Dave Loper wrote:

Marcel,

I use two addons for Atom on Mac, 'platformio-ide-terrminal' and 'Markdown Preview'. I can open a terminal in MacOSX and sometimes I do that as well but you can see full function in the screenshots I will post.

From Atom, I open a project after I clone it. Make changes, then stage the changes.


With the stages changes, I write a commit message and commit the code.


Lastly, you have to push the commit


I don't see any merge request from you. What you want to do is to fork a project, make changes to your personal fork, the send the commit as a merge request. You will want to set up a shared runner so that your local CI/CD can build it before your commit merge will show up.

Thanks for the screenshots and the explanation. This confirms that I'm doing it right. Only I have the Gitlab-integration plugin installed not sure what that is doing. Maybe I have to disable it and see what happens.

I did not make a merge request yet. I will make one in a minute.

The last part I don't understand completely. You talking about shared runner, CI/CD. What is the purpose of it and what must I do? I see these terms in the Gitlab menu..

Update: The terminal plugin is very useful!

OK. It looks like platformio-ide-terrminal gives you the terminal session at the bottom of the screen. Presumably you can do all your git command line operations here.

From my installation, the gitlab package seems dead and it is no longer maintained so I have removed it. gitlab-integration gives you the CI status at the bottom right of the screenshot, but I am only getting it on one of the two windows so I am not sure exactly what is needed to make it show here.

Marcel,

I use two addons for Atom on Mac, 'platformio-ide-terrminal' and 'Markdown Preview'. I can open a terminal in MacOSX and sometimes I do that as well but you can see full function in the screenshots I will post.

From Atom, I open a project after I clone it. Make changes, then stage the changes.


With the stages changes, I write a commit message and commit the code.


Lastly, you have to push the commit


I don't see any merge request from you. What you want to do is to fork a project, make changes to your personal fork, the send the commit as a merge request. You will want to set up a shared runner so that your local CI/CD can build it before your commit merge will show up.

Marcel van van Leeuwen wrote:
If you can merge my master to the ClearOS 7 and the push it to the testing repos would be nice (maybe in near future). I can then check via a VM the updates.

My use of Git is relatively basic so does not yet extend to merge requests. I also have no idea about the translation system. I'll have to leave the merges to Dave.

I think you don't need "Gitlab(?)" I searched for it but I can't find it so I only installed "Gitlab-intregation". The only thing I have to do now on the command line is the clone procedure. Very useful that you can do most via the Atom app.

I translated 2 apps!

If you can merge my master to the ClearOS 7 and the push it to the testing repos would be nice (maybe in near future). I can then check via a VM the updates.

Cool stuff Nick.

I have two extensions installed but I don't know what does what - Atom gitlab-integration and gitlab(?). Both need a personal access tolken you set up in Gitlab. Instructions are in Atom > Settings > Packages > gitlab-integration > Settings.

On the top right side of the main UI first select the packages to stage, or Stage All. Enter a Commit message. Commit to Master. Then at the very bottom, Push.

I don't know how to then merge Master with Clear7 for the moment (this forces a build on the ClearCenter Koji and pushes the package to one if the testing repos if it has been enabled).

I'm not sure how it's working with Atom. I can open a project what I've cloned and edit the files in Atom. After that I can do "git status", "git add ." "git commit -m "some text"" on Git for Windows (Git command prompt). If I check the Gitlab website the changes are received.

Commiting happened down on the bottom right of the screen, from memory you click on the Git icon, bottom right, and a panel opens up. You can put your commit message there and commit. I can't remember for the life of me how I pushed, but I think you get the option once you have some commits. To help with cloning and committing, I added my private SSH key to C:\Users\Nick\.ssh

Yes, I also did a git clone in the terminal app of MacOS. I want to push to Gitlab again. I thought Dave said it all could be done with Atom but yes you can also do in the terminal. Something to investigate. Maybe I have a Udemy course where this is explained.

Dave had me download Git for Windows which opens a sort of command prompt where Windows and Linux commands work. In there, I had to navigate to a working folder of my choice then do a "git clone .....". Once the project was cloned, in Atom I could then open a project folder and see what I'd cloned. There was no need to use a plugin. The only reason to use the git command prompt was to switch branches and do some git manipulations, although some of them could be done directly in Atom.