Update sync-gitlab.yml - Githubissues

oscam-emu / oscam-patched

Open Source Cam Emulator

GNU General Public License v3.0

6 stars 6 forks source link

Closed WXbet closed 2 months ago

WXbet commented 2 months ago

both commands can be reduced to one command because oscam-gitlab creates annotated tags in automation
maybe we can automerge from oscam-gitlab branch

nautilus7 commented 2 months ago

What if there are merge conflicts when merging gitlab to master?

Best would be to create a PR instead. There is a create pull request action but haven't look into it.

WXbet commented 2 months ago

Not a problem. When merge conflict arise, then we have to do it manually like today. Mostly changes are mergeable.

BUT: my last commit is shitty 👎

nautilus7 commented 2 months ago

Plus the merge or create PR workflow should be a different workflow in a separate file. Triggered on push in "oscam-gitlab"

nautilus7 commented 2 months ago

Not a problem. When merge conflict arise, then we have to do it manually like today. Mostly changes are mergeable.

BUT: my last commit is shitty 👎

The merge won't happen you mean? Then the action will fail? What do you mean?

WXbet commented 2 months ago

The merge won't happen you mean? Then the action will fail? What do you mean?

Yes, When merge conflict arise, the merge won't happen and the job will fail. The we have to do it by hand.

WXbet commented 2 months ago

Plus the merge or create PR workflow should be a different workflow in a separate file. Triggered on push in "oscam-gitlab"

nautilus7 commented 2 months ago

@WXbet this is ready for merging right?

WXbet commented 2 months ago

I think so, not tested if it works fine. It's my first github workflow that I've created so far...