Devel ergo cub sn001

[pattacini]

Update upstream ergoCubSN001 conf files.

[pattacini]

Just a few inline comments before merging.

[S-Dafarra]

There are two commits that are workaround for hardware issues we have currently in the robot. Namely:

• 871b344.
• a182c73

Corresponding tickets:

• ergoCub 1.1 S/N:001 – Right shoulder roll encoder AEA invalid data icub-tech-support#1901
• ergoCub 1.1 S/N:001 – Robot does not start icub-tech-support#1908
• ergoCub 1.1 S/N:001 – Right arm FT broken icub-tech-support#1909

Let me know if you want to proceed anyhow. If you do, can we avoid to squash? In this way it gets easy to revert them when the robot is fixed

[pattacini]

Let me know if you want to proceed anyhow. If you do, can we avoid to squash? In this way it gets easy to revert them when the robot is fixed

We need to avoid squashing anyhow for the reason reported in par. 5.i at https://github.com/robotology/robots-configuration/blob/master/.github/CONTRIBUTING.md#-fast-pace-local-workflow.

I may try to cherry-pick the other commits in upstream@devel and check whether this PR will get updated with the remaining commits. Once verified, I can close the PR unmerged.

Does it sound ok?

[pattacini]

I may try to cherry-pick the other commits in upstream@devel and check whether this PR will get updated with the remaining commits. Once verified, I can close the PR unmerged.

Or even quicker for me, I could merge the PR and then revert those two commits.

What do you prefer?

[S-Dafarra]

I have booked the robot at 13. I can rebase the branch on upstream@devel, and back up those two commits in another branch. Then, we can merge this (without the two commits) and I will take care of bringing those commits back into devel-ergoCubSN001. Would that work?

[pattacini]

Perfect! Go ahead this way.

[S-Dafarra]

Done @pattacini, the PR is ready to go

[pattacini]

Thanks!
I'll merge it after the CI.

[S-Dafarra]

One thing that I noticed is that the bot has push-force permission. I think it might be better to protect the branch from push force and allow only a handful of people doing it

[pattacini]

The bot is an org admin and I need it with such a role.
I've removed the bypass rule for org admins and enabled the bypass for repo maintainers.
Thereby, I've just made you a repo maintainer.

Not sure if this change will work. Need testing.

[S-Dafarra]

Awesome! I will test it immediately

[S-Dafarra]

I rebased on top of devel and I force pushed. It wrote the following

Total 0 (delta 0), reused 0 (delta 0), pack-reused 0
remote: Bypassed rule violations for refs/heads/devel-ergoCubSN001:
remote:
remote: - Cannot force-push to this branch
remote:
To https://github.com/icub-tech-iit/robots-configuration.git
 + a51affcbb...5081ba1fa devel-ergoCubSN001 -> devel-ergoCubSN001 (forced update)

In this case they should have been aligned, so it worked anyhow I suppose

[S-Dafarra]

I tried to remove some commit and force pushed and it worked again, same message. Also in this case there were 0 deltas anyhow.

[pattacini]

The message cannot force-push tells us that you cannot force-push when being identified as the bot doing that.
If you try out the same being yourself, we shouldn't get any failure.

[S-Dafarra]

The message cannot force-push tells us that you cannot force-push when being identified as the bot doing that. If you try out the same being yourself, we shouldn't get any failure.

I did not enter my credentials, I suppose I pushed as bot